Merge branch 'master' into release/5.6

@@ -735,7 +735,7 @@ const setMasterCard = (req, res) => {
 };
 
 const sessionKeyAuth = (req, res, next) => {
-    let uid = req.user.uid || req.query.uid || req.cookies.installmentUid;
+    let uid = req.query.uid || req.cookies.installmentUid || (req.user.uid && req.user.uid.toString()) || '';
     let sessionKey = _.get(req, 'user.uid.sessionKey');
 
     if (sessionKey && !req.session.SESSION_KEY) {

@@ -71,15 +71,6 @@ exports.fetchHistory = (req, res) => {
     });
 };
 
-
-exports.msghistory = (req, res) => {
-    let uid = req.user.uid || req.query.uid;
-
-    imApi.fetchImHistory(uid).then(result => {
-        res.json(result);
-    });
-};
-
 /**
  *  Request: 发表留言
  *  type: POST

@@ -39,13 +39,11 @@ exports.saveMessage = (encryptedUid, conversationId, content) => {
  *  @param [int] endTime
  */
 exports.fetchImHistory = (encryptedUid, endTime, pageSize, startTime) => {
-    pageSize = pageSize || 10;
-
     let params = {
-        pageSize,
         encryptedUid
     };
 
+
     _.forEach({startTime, endTime}, (val, key) => {
         val && (params[key] = val);
     });

@@ -16,7 +16,9 @@ module.exports = () => {
             if (req.path === '/') {
                 return res.redirect('//m.yohobuy.com');
             }
-            req.url = `/activity${req.url}`;
+            if (req.path !== '/.well-known/apple-app-site-association') {
+                req.url = `/activity${req.url}`;
+            }
         } else if (req.subdomains.length) {
             switch (req.subdomains[0]) {
                 case 'guang': // 逛

@@ -760,7 +760,7 @@ let chat = {
             return $.Deferred().resolve(false); // eslint-disable-line
         }
 
-        return api.msghistory(encryptedUid, msgHistory.endTime)
+        return api.fetchHistory(msgHistory.endTime)
             .done(function(result) {
                 if (!result || result.code !== 200 || !result.data) {
                     return false;

@@ -67,10 +67,10 @@ let api = {
     },
 
     // 获取10条历史记录
-    msghistory: function(uid, endTime) {
+    fetchHistory: function(endTime) {
         let url = '/service/im/fetchHistory';
         let data = {
-            uid
+            encryptedUid
         };
 
         endTime && (data.endTime = endTime);