Merge remote-tracking branch 'origin/master' into feature/qps

@@ -27,7 +27,7 @@ router.post('/check/submit', validateCode.check, check.submit);
 router.get('/questionnaire', auth, question.list);
 router.get('/questionnaire', auth, question.list);
 router.post('/questionnaire/check', question.check);
 router.post('/questionnaire/check', question.check);
 router.post('/questionnaire/submit', question.submit);
 router.post('/questionnaire/submit', question.submit);
-router.get('/questionnaire/:id', auth, question.detail);
+router.get('/questionnaire/:id', question.detail);
 router.get('/material', auth, materialNew.list);
 router.get('/material', auth, materialNew.list);
 
 
 module.exports = router;
 module.exports = router;

@@ -4,7 +4,6 @@ const aes = require('./aes-pwd');
 const authcode = require('../../../utils/authcode');
 const authcode = require('../../../utils/authcode');
 const logger = global.yoho.logger;
 const logger = global.yoho.logger;
 const sign = global.yoho.sign;
 const sign = global.yoho.sign;
-const api = global.yoho.API;
 const uuid = require('uuid');
 const uuid = require('uuid');
 const url = require('url');
 const url = require('url');
 const md5 = require('yoho-md5');
 const md5 = require('yoho-md5');
@@ -30,7 +29,7 @@ class AuthModel extends global.yoho.BaseModel {
             param.shopping_key = shoppingKey;
             param.shopping_key = shoppingKey;
         }
         }
 
 
-        return api.post('', param);
+        return this.post({data: param});
     }
     }
 
 
     signinAes(area, profile, password, shoppingKey, ip, isSkip, from) {
     signinAes(area, profile, password, shoppingKey, ip, isSkip, from) {
@@ -49,12 +48,8 @@ class AuthModel extends global.yoho.BaseModel {
 
 
         logger.info(`${profile}, login from ${ip}`);
         logger.info(`${profile}, login from ${ip}`);
 
 
-        return api.post('', param, {
-            headers: {
-                'user-agent': 'yoho/nodejs',
-                'X-YOHO-IP': ip,
-                'X-Forwarded-For': ip
-            }
+        return this.post({
+            data: param
         });
         });
     }
     }
 
 
@@ -71,7 +66,7 @@ class AuthModel extends global.yoho.BaseModel {
             param.shopping_key = params.shoppingKey;
             param.shopping_key = params.shoppingKey;
         }
         }
 
 
-        return api.get('', param);
+        return this.get({data: param});
     }
     }
 
 
     profile(uid) {
     profile(uid) {
@@ -80,7 +75,7 @@ class AuthModel extends global.yoho.BaseModel {
             method: 'app.passport.profile'
             method: 'app.passport.profile'
         };
         };
 
 
-        return api.get('', param);
+        return this.get({data: param});
     }
     }
 
 
     thirdSign(params, clientSecret) {
     thirdSign(params, clientSecret) {

@@ -12,7 +12,7 @@
         a.async = 1;
         a.async = 1;
         a.src = j;
         a.src = j;
         m.parentNode.insertBefore(a, m);
         m.parentNode.insertBefore(a, m);
-    }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.4.6/yas.js', '_yas'));
+    }(window, document, 'script', (document.location.protocol === 'https:' ? 'https:' : 'http:') + '//cdn.yoho.cn/yas-jssdk/2.4.7/yas.js', '_yas'));
 
 
     var _hmt = _hmt || [];
     var _hmt = _hmt || [];
 
 
@@ -56,7 +56,7 @@
         uid = uid === 0 ? '' : uid;
         uid = uid === 0 ? '' : uid;
         window._ozuid = uid; // 暴露ozuid
         window._ozuid = uid; // 暴露ozuid
         if (window._yas) {
         if (window._yas) {
-            window._yas(1 * new Date(), '2.4.6', 'yohobuy_m', uid, '', '');
+            window._yas(1 * new Date(), '2.4.7', 'yohobuy_m', uid, '', '');
         }
         }
 
 
         setTimeout(function() {
         setTimeout(function() {

@@ -73,7 +73,7 @@
     "xml2js": "^0.4.19",
     "xml2js": "^0.4.19",
     "yoho-express-session": "^2.0.0",
     "yoho-express-session": "^2.0.0",
     "yoho-md5": "^2.0.0",
     "yoho-md5": "^2.0.0",
-    "yoho-node-lib": "=0.5.7",
+    "yoho-node-lib": "=0.5.10",
     "yoho-zookeeper": "^1.0.8"
     "yoho-zookeeper": "^1.0.8"
   },
   },
   "devDependencies": {
   "devDependencies": {