chanjs 1.0.23 → 1.0.24

package/core/chan.js

@@ -58,8 +58,6 @@ class Chan {
     const configPath = path.join(Chan.config.APP_PATH, "config/index.js");
     if (fs.existsSync(configPath)) {
       const config = require(configPath);
-      // let allConfig = {...Chan.config,...config};
-      // this.app.config = Chan.config = allConfig;
       Chan.config = {...Chan.config,...config};
     }
   }
@@ -152,7 +150,7 @@ class Chan {
    * @description app核心模块：日志、favicon 图标、cookie、json、url、模板引擎、静态资源
    */
   loadCore(){
-    console.log()
+
     core(this.app, Chan.config);
   }
 
@@ -167,16 +165,23 @@ class Chan {
         .filter((dirent) => dirent.isDirectory())
         .map((dirent) => dirent.name);
         Chan[modules]={};
-        for(let i=0,item;i<dirs.length;i++){
-          item = dirs[i];
+
+        // 先加载所有服务
+        dirs.forEach(item => {
           Chan[modules][item] = {
-            controller: {},
             service: {},
+            controller: {},
           };
+          this.loadServices(modules, item);
+        });
+
+        // 加载控制器和路由
+        dirs.forEach(item => {
           this.loadModule(modules,item);
-        }
-      //执行路由
-      // this.app.use(this.router);
+        });
+        
+        //执行路由
+        // this.app.use(this.router);
     }
   }
 
@@ -186,7 +191,6 @@ class Chan {
    * @param {String} moduleName 模块名称
    */
   loadModule(modules,moduleName) {
-    this.loadServices(modules,moduleName);
     this.loadControllers(modules,moduleName);
     this.loadRoutes(modules,moduleName);
   }
@@ -269,5 +273,5 @@ class Chan {
     });
   }
 }
-
+global.Chan = Chan;
 module.exports = Chan;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chanjs",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "Chan.js基于express 纯js研发的轻量级mvc框架。",
   "main": "core/chan.js",
   "module": "core/chan.js",