From 52145c676eaf86de160ebd20f26e91667b0b812c Mon Sep 17 00:00:00 2001
From: Luk Lu <luk.lu@faronear.org>
Date: Sun, 24 Apr 2022 16:42:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E7=9D=80=20base.enviconfig=20?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=97=20configFiles=20=E5=8F=82=E6=95=B0=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B0=83=E7=94=A8=E5=8F=82=E6=95=B0=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server.js b/server.js
index d2603df..10551ae 100644
--- a/server.js
+++ b/server.js
@@ -3,7 +3,7 @@ const path = require('path')
 const express = require('express')
 
 const wo = (global.wo = { 
-  envar : require('base.enviconfig').mergeConfig({
+  envar : require('base.enviconfig').mergeConfig({rawConfig: {
     Commander_Option_List: [
       // 命令行里可以接受的参数。将传给 config.js 里的 commander。每个参数的定义格式是 [参数名，参数键，描述]，后两者用于传给commander，取值后覆盖掉Config里的同名变量。
       ['Web_Protocol', '-P, --Web_Protocol <string>', 'Web protocol: http|https|httpall.'],
@@ -23,7 +23,7 @@ const wo = (global.wo = {
         { Web_Root: 'dist', Web_Index: 'index.html', domainList: ['']}
       ],
       */
-  })
+  }})
 })
 if (typeof wo.envar.Web_Ssl === 'string') {
   wo.envar.Web_Ssl = eval(`(${wo.envar.Web_Ssl})`)