From cfd9743f2092116156fa21fa2dae71bb8484db0e Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Fri, 25 Oct 2019 00:32:03 +0800
Subject: [PATCH] up

---
 server.js | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/server.js b/server.js
index 2c5da41..4e27a36 100644
--- a/server.js
+++ b/server.js
@@ -10,26 +10,27 @@ function config(){
 
   // 读取配置文件
 try {
-  if (fs.existsSync(path.join(process.cwd(), './ConfigBasic.js'))) {
-    Config=require(path.join(process.cwd(), './ConfigBasic.js'))
-    console.info('ConfigBasic loaded')
+  let configFile
+  if (fs.existsSync(configFile = path.join(process.cwd(), './ConfigBasic.js'))) {
+    Config=require(configFile)
+    console.info(`${configFile} loaded`)
   }else {
-    console.info('Missing and omitting ConfigBasic')
+    console.info(`Missing and omitting ${configFile}`)
   }
-  if (fs.existsSync(path.join(process.cwd(), './ConfigCustom.js'))) { // 如果存在，覆盖掉 ConfigBasic 里的默认参数
-    Config=deepmerge(Config, require(path.join(process.cwd(), './ConfigCustom.js'))) // 注意，objectMerge后，产生了一个新的对象，而不是在原来的Config里添加
-    console.info('ConfigCustom loaded')
+  if (fs.existsSync(configFile = path.join(process.cwd(), './ConfigCustom.js'))) { // 如果存在，覆盖掉 ConfigBasic 里的默认参数
+    Config=deepmerge(Config, require(configFile)) // 注意，objectMerge后，产生了一个新的对象，而不是在原来的Config里添加
+    console.info(`${configFile} loaded`)
   }else {
-    console.info('Missing and omitting ConfigCustom')
+    console.info(`Missing and omitting ${configFile}`)
   }
-  if (fs.existsSync(path.join(process.cwd(), './ConfigSecret.js'))) { // 如果存在，覆盖掉 ConfigBasic 和 ConfigCustom 里的参数
-    Config=deepmerge(Config, require(path.join(process.cwd(), './ConfigSecret.js')))
-    console.info('ConfigSecret loaded')
+  if (fs.existsSync(configFile = path.join(process.cwd(), './ConfigSecret.js'))) { // 如果存在，覆盖掉 ConfigBasic 和 ConfigCustom 里的参数
+    Config=deepmerge(Config, require(configFile))
+    console.info(`${configFile} loaded`)
   }else {
-    console.info('Missing and omitting ConfigSecret')
+    console.info(`Missing and omitting ${configFile}`)
   }
 }catch(err){
-  console.error('Loading config files failed: '+err.message)
+  console.error(`Loading config files failed: ${err.message}`)
 }
 
   // 载入命令行参数