Merge branch 'dev' into dev-assert

This commit is contained in:
suxiaoxin 2017-10-24 17:51:58 +08:00
commit 9bb4b52faa
2 changed files with 2 additions and 1 deletions

View File

@ -21,8 +21,8 @@ let indexFile = process.argv[2] === 'dev' ? 'dev.html' : 'index.html';
const app = websockify(new Koa());
yapi.app = app;
app.use(mockServer);
app.use(bodyParser({multipart: true}));
app.use(mockServer);
app.use(router.routes());
app.use(router.allowedMethods());

View File

@ -145,6 +145,7 @@ module.exports = async (ctx, next) => {
try{
res = Mock.mock(res);
}catch(e){
yapi.commons.log(e, 'error')
res = res;
}