From 4b9b7845851b4543949d8e7e047db4f9e60594fe Mon Sep 17 00:00:00 2001
From: "luk.lu" <luk.lu@faronear.org>
Date: Thu, 21 Jul 2022 09:08:04 +0800
Subject: [PATCH] u

---
 package.json              | 5 ++---
 server.js => webserver.js | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename server.js => webserver.js (96%)

diff --git a/package.json b/package.json
index 54862ac..059cd75 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "basend-webserver",
   "version": "1.0.0",
   "description": "Launch web server",
-  "main": "server.js",
+  "main": "webserver.js",
   "author": "",
   "scripts": {
     "check": "npx cross-env NODE_ENV=development node --inspect-brk server.js",
@@ -12,8 +12,8 @@
     "serve.pm2": "npx cross-env NODE_ENV=production npx pm2 start server.js"
   },
   "dependencies": {
+    "basend-envar": "git+https://git.faronear.org/npm/basend-envar",
     "body-parser": "^1.18.2",
-    "commander": "^2.18.0",
     "compression": "^1.7.3",
     "cookie-parser": "^1.4.3",
     "deepmerge": "^2.1.1",
@@ -23,7 +23,6 @@
     "method-override": "^2.3.10",
     "morgan": "^1.9.0",
     "serve-favicon": "^2.5.0",
-    "basend-envar": "git+https://git.faronear.org/npm/basend-envar",
     "vhost": "^3.0.2"
   },
   "devDependencies": {
diff --git a/server.js b/webserver.js
similarity index 96%
rename from server.js
rename to webserver.js
index d4c689f..f9421c2 100644
--- a/server.js
+++ b/webserver.js
@@ -6,7 +6,7 @@ const wo = (global.wo = {
   envar: require('basend-envar').merge_envar({
     rawEnvar: {
       Commander_Option_List: [
-        // 命令行里可以接受的参数。将传给 config.js 里的 commander。每个参数的定义格式是 [参数名，参数键，描述]，后两者用于传给commander，取值后覆盖掉Config里的同名变量。
+        // 命令行里可以接受的参数。将传给 commander。每个参数的定义格式是 [参数名，参数键，描述]，后两者用于传给 commander，取值后覆盖掉同名变量。
         ['webProtocol', '-P, --webProtocol <string>', 'Web protocol: http|https|httpall.'],
         ['webHostname', '-H, --webHostname <string>', 'Host IP or domain name.'],
         ['webPort', '-p, --webPort <number>', 'HTTP port number.'],
@@ -25,6 +25,7 @@ const wo = (global.wo = {
       ],
       */
     },
+    envarFiles: ['./envar-web-basic.js', './envar-web-custom.js'],
   }),
 })
 if (typeof wo.envar.webSsl === 'string') {