diff --git a/package.json b/package.json index 8d820cd..4f89d8f 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,6 @@ "serve.pm2": "npx cross-env NODE_ENV=production npx pm2 start server.js" }, "dependencies": { - "wo-base-envar": "git+https://git.faronear.org/npm/wo-base-envar", "body-parser": "^1.18.2", "compression": "^1.7.3", "cookie-parser": "^1.4.3", @@ -23,7 +22,9 @@ "method-override": "^2.3.10", "morgan": "^1.9.0", "serve-favicon": "^2.5.0", - "vhost": "^3.0.2" + "vhost": "^3.0.2", + "wo-base-envar": "git+https://git.faronear.org/npm/wo-base-envar", + "wo-core-toolkit": "git+https://git.faronear.org/npm/wo-core-toolkit" }, "devDependencies": { "cross-env": "^7.0.2", diff --git a/webserver.js b/webserver.js index e86913a..a1a02d2 100644 --- a/webserver.js +++ b/webserver.js @@ -1,6 +1,7 @@ const fs = require('fs') const path = require('path') const express = require('express') +const coretool = require('wo-core-toolkit') const wo = (global.wo = { envar: require('wo-base-envar').merge_envar({ @@ -16,7 +17,7 @@ const wo = (global.wo = { // 最基础的必须的默认配置,如果用户什么也没有提供 webProtocol: process.env.NODE_ENV !== 'production' ? 'http' : 'httpall', webHostname: 'localhost', - webPort: process.env.NODE_ENV !== 'production' ? 8338 : undefined, + webPort: process.env.NODE_ENV !== 'production' ? coretool.BASEPORT_WEB_SERVER + 338 : undefined, webRoot: process.env.NODE_ENV !== 'production' ? 'unpackage/dist/build/h5' : '_webroot', // local path to serve as webroot webIndex: 'index.html', webSsl: