ee-core 2.2.2 → 2.2.3-beta.1

package/config/config.default.js

@@ -198,6 +198,30 @@ module.exports = appInfo => {
     },
   };
 
+  /**
+   * 应用模式配置
+   */
+  config.developmentMode = {
+    default: 'vue',
+    mode: {
+      vue: {
+        protocol: 'http://',
+        hostname: 'localhost',
+        port: 8080
+      },
+      react: {
+        protocol: 'http://',
+        hostname: 'localhost',
+        port: 3000
+      },
+      html: {
+        protocol: 'http://',
+        hostname: 'localhost',
+        indexPage: 'index.html'
+      },
+    }
+  };
+
   /* 内置socket服务 */
   config.socketServer = {
     enable: false, // 是否启用
@@ -238,7 +262,8 @@ module.exports = appInfo => {
 
   /* 主进程加载的地址 */
   config.mainServer = {
-    protocol: 'http://',
+    protocol: 'http://', // http:// | https:// | file://
+    indexPath: '/public/dist/index.html',
     host: 'localhost',
     port: 7072, // 默认端口（如果端口被使用，则随机获取一个）
     options: {},

package/config/index.js

@@ -49,6 +49,26 @@ const Cfg = {
   
     return v;
   },  
+
+  /**
+   * isFileProtocol
+   */
+  isFileProtocol(config) {
+    if (config.protocol == 'file://') {
+      return true;
+    }
+    return false;
+  },
+
+  /**
+   * isWebProtocol
+   */
+  isWebProtocol(config) {
+    if (['http://', 'https://'].includes(config.protocol)) {
+      return true;
+    }
+    return false;
+  },   
 };
 
 module.exports = Cfg;

package/ee/eeApp.js

@@ -28,7 +28,7 @@ class EeApp extends BaseApp {
    * 生成端口
    */
   async createPorts() {
-    if (Ps.isFrameworkMode()) {
+    if (Ps.isFrameworkMode() && Conf.isWebProtocol(this.config.mainServer)) {
       const mainPort = await GetPort({port: this.config.mainServer.port});
       process.env.EE_MAIN_PORT = mainPort;
       this.config.mainServer.port = mainPort;
@@ -118,9 +118,16 @@ class EeApp extends BaseApp {
     }
 
     // 单页应用
-    const protocol = modeInfo.protocol || 'http://';
-    url = protocol + modeInfo.hostname + ':' + modeInfo.port;
+    // 开发环境
     if (Ps.isDev()) {
+      url = modeInfo.protocol + modeInfo.hostname + ':' + modeInfo.port;
+      this.loadMainUrl('spa', url);
+      return;
+    } 
+    // 生产环境
+    const mainServer = this.config.mainServer;
+    if (Conf.isFileProtocol(mainServer)) {
+      url = path.join(this.config.homeDir, mainServer.indexPath);
       this.loadMainUrl('spa', url);
     } else {
       this.loadLocalWeb('spa');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ee-core",
-  "version": "2.2.2",
+  "version": "2.2.3-beta.1",
   "description": "ee core",
   "main": "index.js",
   "scripts": {