ee-core 2.7.0-beta.9 → 2.7.1

package/jobs/child/forkProcess.js

@@ -23,7 +23,7 @@ class ForkProcess {
       processOptions: { 
         cwd: cwd,
         env: Ps.allEnv(), 
-        stdio: 'pipe' 
+        stdio: 'ignore' // pipe
       }
     }, opt);
 

package/package.json

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

package/ps/index.js

@@ -5,7 +5,7 @@ const eis = require('../utils/is');
  * 初始化模式
  */
 exports.initMode = function(mode) {
-  // process.env.EE_MODE === undefined
+  if(process.env.EE_MODE !== undefined)return
   return process.env.EE_MODE = mode ? mode : 'framework';
 }
 

package/socket/httpServer.js

@@ -29,13 +29,13 @@ class HttpServer {
       throw new Error('[ee-core] [socket/HttpServer] http port required, and must be a number !');
     }
 
-    this.create();
+    this._create();
   }
 
   /**
    * 创建服务
    */
-  create () {
+  _create () {
     const app = this.app;
     const httpServer = this.options;
     const isHttps = httpServer?.https?.enable ?? false;
@@ -62,7 +62,7 @@ class HttpServer {
         ctx.eeApp = app;
         await next();
       })
-      .use(this.dispatch);
+      .use(this._dispatch);
 
     let msg = '[ee-core] [socket/http] server is: ' + url;
 
@@ -86,13 +86,14 @@ class HttpServer {
   /**
    * 路由分发
    */
-  async dispatch (ctx, next) {
+  async _dispatch (ctx, next) {
     const config = ctx.eeApp.config.httpServer;
     let uriPath = ctx.request.path;
     const method = ctx.request.method;
     let params = ctx.request.query;
     params = is.object(params) ? JSON.parse(JSON.stringify(params)) : {};
     const body = ctx.request.body;
+    const files = ctx.request.files;
 
     // 默认
     ctx.response.status = 200;
@@ -117,7 +118,10 @@ class HttpServer {
         uriPath = 'controller/' + uriPath;
       }
       const cmd = uriPath.split('/').join('.');
-      const args = (method == 'POST') ? body : params;
+      const args = (method == 'POST') ? (ctx.request.header['content-type'] && ctx.request.header['content-type'].startsWith('multipart/form-data;') ? files : body) : params;
+      args.files = ctx.request.files;
+      args.body = ctx.request.body;
+      args.query = ctx.request.query;
       let fn = null;
       if (is.string(cmd)) {
         const actions = cmd.split('.');
@@ -140,4 +144,4 @@ class HttpServer {
   }
 }
 
-module.exports = HttpServer;
+module.exports = HttpServer;