Merge branch 'hotfix/cusServcie-historyMsg' into 'master'

Hotfix/cus servcie history msg



See merge request !480

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

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

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

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