Authored by 郭成尧

Merge branch 'master' into feature/valida

@@ -148,17 +148,6 @@ app.use((req, res, next) => { @@ -148,17 +148,6 @@ app.use((req, res, next) => {
148 req.yoho = {}; // req和res绑定yoho对象,用于传递全局数据, 如req.yoho.channel等 148 req.yoho = {}; // req和res绑定yoho对象,用于传递全局数据, 如req.yoho.channel等
149 req.app.locals.wap = app.locals.wap; // zookeper对象赋值 149 req.app.locals.wap = app.locals.wap; // zookeper对象赋值
150 150
151 - // 临时增加错误日志记录  
152 - let sendJson = res.json;  
153 -  
154 - res.json = function(...args) {  
155 - try {  
156 - sendJson(...args);  
157 - } catch (e) {  
158 - logger.error(`res.json error data: ${JSON.stringify(args)}`);  
159 - }  
160 - };  
161 -  
162 next(); 151 next();
163 }); 152 });
164 153
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
50 "xml2js": "^0.4.17", 50 "xml2js": "^0.4.17",
51 "yoho-express-session": "^2.0.0", 51 "yoho-express-session": "^2.0.0",
52 "yoho-md5": "^2.0.0", 52 "yoho-md5": "^2.0.0",
53 - "yoho-node-lib": "=0.2.16", 53 + "yoho-node-lib": "=0.2.17",
54 "yoho-zookeeper": "^1.0.8" 54 "yoho-zookeeper": "^1.0.8"
55 }, 55 },
56 "devDependencies": { 56 "devDependencies": {