advanced
Advanced tools
Comparing version 0.3.3 to 0.3.4
@@ -47,3 +47,3 @@ var _ = require('lodash'), | ||
if (_.isString(api)) { | ||
api = {uri: api} | ||
api = {uri: api}; | ||
} | ||
@@ -56,3 +56,3 @@ | ||
return Utils.request(api, self.req).then(function(data) { | ||
return Utils.request(api, self.req, self.res).then(function(data) { | ||
ret[key] = self._filterData(data); | ||
@@ -75,3 +75,3 @@ return ret; | ||
if (_.isString(options)) { | ||
options = {uri: options} | ||
options = {uri: options}; | ||
} | ||
@@ -78,0 +78,0 @@ options = _.extend({ |
@@ -62,3 +62,3 @@ var Express = require('express'), | ||
if (config.hasOwnProperty('api') && !config.hasOwnProperty('apis')) { | ||
config.apis = {defaults: config.api} | ||
config.apis = {defaults: config.api}; | ||
} | ||
@@ -76,13 +76,8 @@ Utils.c(config); | ||
var router; | ||
try { | ||
if (Utils.fs.existsSync(Utils.c('routesPath'))) { | ||
router = require(Utils.c('routesPath')); | ||
} catch (e) { | ||
} else { | ||
// 如果文件不存在,则加载默认路由 | ||
if (e.code === 'MODULE_NOT_FOUND') { | ||
router = require('./router')(); | ||
} else { | ||
throw e; | ||
} | ||
router = require('./router')(); | ||
} | ||
return router; | ||
@@ -89,0 +84,0 @@ } |
@@ -29,3 +29,3 @@ var _ = require('lodash'), | ||
output(arguments, type); | ||
} | ||
}; | ||
}); | ||
@@ -48,3 +48,3 @@ | ||
if (timer === null) { | ||
timer = setTimeout(flush, interval) | ||
timer = setTimeout(flush, interval); | ||
} | ||
@@ -98,2 +98,2 @@ | ||
stream && !Utils.isDev() && stream.write(resultToFile.join(' ') + '\n'); | ||
} | ||
} |
{ | ||
"name": "advanced", | ||
"version": "0.3.3", | ||
"version": "0.3.4", | ||
"description": "A simple MVC framework based on Express", | ||
@@ -5,0 +5,0 @@ "main": "./lib/index.js", |
35649
869