fix controller.js

michaelliao · michaelliao · commit 6c2f10f3d8dc · 2016-09-24T10:33:31.000+08:00
diff --git a/samples/node/web/koa/url2-koa/controller.js b/samples/node/web/koa/url2-koa/controller.js
@@ -27,15 +27,15 @@ function addMapping(router, mapping) {
     }
 }
 
-function addControllers(router) {
-    var files = fs.readdirSync(__dirname + '/controllers');
+function addControllers(router, dir) {
+    var files = fs.readdirSync(__dirname + '/' + dir);
     var js_files = files.filter((f) => {
         return f.endsWith('.js');
     }, files);
 
     for (var f of js_files) {
         console.log(`process controller: ${f}...`);
-        let mapping = require(__dirname + '/controllers/' + f);
+        let mapping = require(__dirname + '/' + dir + '/' + f);
         addMapping(router, mapping);
     }
 }
@@ -44,6 +44,6 @@ module.exports = function (dir) {
     let
         controllers_dir = dir || 'controllers',
         router = require('koa-router')();
-    addControllers(router);
+    addControllers(router, controllers_dir);
     return router.routes();
 };

Original file line number	Diff line number	Diff line change
`@@ -27,15 +27,15 @@ function addMapping(router, mapping) {`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`
`30`		`-function addControllers(router) {`
`31`		`- var files = fs.readdirSync(__dirname + '/controllers');`
	`30`	`+function addControllers(router, dir) {`
	`31`	`+ var files = fs.readdirSync(__dirname + '/' + dir);`
`32`	`32`	`var js_files = files.filter((f) => {`
`33`	`33`	`return f.endsWith('.js');`
`34`	`34`	`}, files);`
`35`	`35`
`36`	`36`	`for (var f of js_files) {`
`37`	`37`	console.log(`process controller: ${f}...`);
`38`		`- let mapping = require(__dirname + '/controllers/' + f);`
	`38`	`+ let mapping = require(__dirname + '/' + dir + '/' + f);`
`39`	`39`	`addMapping(router, mapping);`
`40`	`40`	`}`
`41`	`41`	`}`
`@@ -44,6 +44,6 @@ module.exports = function (dir) {`
`44`	`44`	`let`
`45`	`45`	`controllers_dir = dir \|\| 'controllers',`
`46`	`46`	`router = require('koa-router')();`
`47`		`- addControllers(router);`
	`47`	`+ addControllers(router, controllers_dir);`
`48`	`48`	`return router.routes();`
`49`	`49`	`};`