Authored by 郭成尧

Merge branch 'master' into feature/valida

... ... @@ -148,17 +148,6 @@ app.use((req, res, next) => {
req.yoho = {}; // req和res绑定yoho对象,用于传递全局数据, 如req.yoho.channel等
req.app.locals.wap = app.locals.wap; // zookeper对象赋值
// 临时增加错误日志记录
let sendJson = res.json;
res.json = function(...args) {
try {
sendJson(...args);
} catch (e) {
logger.error(`res.json error data: ${JSON.stringify(args)}`);
}
};
next();
});
... ...
... ... @@ -50,7 +50,7 @@
"xml2js": "^0.4.17",
"yoho-express-session": "^2.0.0",
"yoho-md5": "^2.0.0",
"yoho-node-lib": "=0.2.16",
"yoho-node-lib": "=0.2.17",
"yoho-zookeeper": "^1.0.8"
},
"devDependencies": {
... ...