Merge branch 'im-internet-hospital' of http://192.168.1.220:10080/Amoy/im.doctor into im-internet-hospital

src/server/models/sessions/topics.js

@@ -233,7 +233,7 @@ class Topics extends RedisModel {
                ModelUtil.emitOK(self.eventEmitter, {status: -1, message: err});
            }
            let sessions = new Sessions();
            sessions.getMessages(res[0].session_id, user, startMsgId, endMsgId, page, pagesize, 0, function (err, messages) {
            sessions.getMessages(res[0].session_id, user, startMsgId, endMsgId, page, pagesize, 0, 0,function (err, messages) {
                if (err) {
                    ModelUtil.emitOK(self.eventEmitter, {status: 200, data: {"list":[],"users":[]}});
                } else {

src/server/resources/config/config.test.js

@@ -13,7 +13,8 @@ let imDbConfig = {
let redisConfig = {
    host: '172.26.0.253',
    port: 6379,
    db: 1
    db: 1,
    password:'Kb6wKDQP1W4'
};
// let redisConfig = {
//     host: '192.168.1.220',
@@ -24,7 +25,8 @@ let redisConfig = {
let innerRedisConfig = {
    host: '172.26.0.253',
    port: 6379,
    db: 1
    db: 1,
    password:'Kb6wKDQP1W4'
};
// 三师后台
let wlyyServerConfig = {