From 7725f2b5cb8cbfec62e7a5d343babd2d890574ac Mon Sep 17 00:00:00 2001
From: "luk.lu" <luk.lu@faronear.org>
Date: Tue, 20 Sep 2022 14:47:42 +0800
Subject: [PATCH] replace 'core.BASEPORT_WEB_SERVER+338' to
 'coretool.PORT_WEB_SERVER_DEV'

---
 webserver.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/webserver.js b/webserver.js
index a1a02d2..41ef9e3 100644
--- a/webserver.js
+++ b/webserver.js
@@ -16,8 +16,8 @@ const wo = (global.wo = {
       ],
       // 最基础的必须的默认配置，如果用户什么也没有提供
       webProtocol: process.env.NODE_ENV !== 'production' ? 'http' : 'httpall',
-      webHostname: 'localhost',
-      webPort: process.env.NODE_ENV !== 'production' ? coretool.BASEPORT_WEB_SERVER + 338 : undefined,
+      webHostname: process.env.NODE_ENV !== 'production' ? 'localhost' : 'unknownhost',
+      webPort: process.env.NODE_ENV !== 'production' ? coretool.PORT_WEB_SERVER_DEV : undefined,
       webRoot: process.env.NODE_ENV !== 'production' ? 'unpackage/dist/build/h5' : '_webroot', // local path to serve as webroot
       webIndex: 'index.html',
       webSsl:
@@ -57,7 +57,7 @@ if (typeof wo.envar.webSsl === 'string') {
   //   communityMember: false,
   //   store: require('greenlock-store-fs'),
   //   email: 'ssl@faronear.org',
-  //   approvedDomains: wo.wo.envar.sslDomains,
+  //   approvedDomains: wo.envar.sslDomains,
   //   configDir: path.resolve(__dirname, 'ssl'),
   //   app: server,
   // })
@@ -114,7 +114,7 @@ if (typeof wo.envar.webSsl === 'string') {
     let portHttps = wo.envar.webPort || 443
     webServer = require('https')
       .createServer(
-        //        wo.wo.envar.webSsl.type==='greenlock' ? greenlock.httpsOptions :
+        //        wo.envar.webSsl.type==='greenlock' ? greenlock.httpsOptions :
         {
           key: fs.readFileSync(wo.envar.webSsl.file.key),
           cert: fs.readFileSync(wo.envar.webSsl.file.cert),
@@ -132,10 +132,10 @@ if (typeof wo.envar.webSsl === 'string') {
   } else if ('httpall' === wo.envar.webProtocol) {
     let portHttp = wo.envar.webPort?.portHttp || 80
     let portHttps = wo.envar.webPort?.portHttps || 443
-    //    if (wo.wo.envar.webSsl.type==='greenlock') {
+    //    if (wo.envar.webSsl.type==='greenlock') {
     //      greenlock.listen(portHttp, portHttps, function (err) {
     //        if (err) console.error(err)
-    //        else console.log(`Server listening on [${wo.wo.envar.webProtocol}] http=>https://${wo.wo.envar.webHostname}:${portHttp}=>${portHttps} for ${server.settings.env} environment`)
+    //        else console.log(`Server listening on [${wo.envar.webProtocol}] http=>https://${wo.envar.webHostname}:${portHttp}=>${portHttps} for ${server.settings.env} environment`)
     //      })
     //    }else {
     require('http')