bug修复

src/server/models/sessions/sessions.js

@@ -1384,7 +1384,12 @@ class Sessions extends RedisModel {
                //是否过滤指定类型
                if( type != null){
                    let typeString = type.split(",");
                    if(!typeString.contains(res[j].type)){
                    var str = res[j].type;
                    var str1 = str.toString();
                    log.info("12312321"+str1);
                    if(typeString.indexOf(str1)<0){
                        log.info("12312321"+str1);
                        log.info("13::"+typeString.indexOf(str1)<0);
                        continue;
                    }
                }
@@ -1447,19 +1452,28 @@ class Sessions extends RedisModel {
     */
    getSessionUnreadMessageCount(sessionId, userId, handler) {
        let self = this;
        log.info("sessionId"+sessionId);
        let messagesByTimestampKey = RedisModel.makeRedisKey(REDIS_KEYS.MessagesByTimestamp, sessionId);
        let participantsKey = RedisModel.makeRedisKey(REDIS_KEYS.SessionParticipants, sessionId);
        log.info("12321321"+messagesByTimestampKey);
        async.waterfall([
            // 此成员最后获取消息的时间
            function (callback) {
                redis.zscoreAsync(participantsKey, userId)
                    .then(function (lastFetchTime) {
                        callback(null, lastFetchTime);
                    })
                try {
                    log.info("进入1231");
                    redis.zscoreAsync(participantsKey, userId)
                        .then(function (lastFetchTime) {
                            callback(null, lastFetchTime);
                        })
                    log.info("进入4321");
                }catch (e){
                    log.error(e);
                }
            },
            // 计算最后获取消息的时间之后到现在有多少条消息
            function (lastFetchTime, callback) {
                log.info("进入4");
                if (!lastFetchTime) lastFetchTime = 0;
                let now = new Date().getTime();
                redis.zcountAsync(messagesByTimestampKey, parseInt(lastFetchTime)+1, now)
@@ -1470,6 +1484,7 @@ class Sessions extends RedisModel {
                            ModelUtil.emitOK(self.eventEmitter, {count: count});
                        }
                    })
                log.info("进入5");
            }
        ], function (err, res) {
            if (err) {
@@ -1480,6 +1495,7 @@ class Sessions extends RedisModel {
                }
            }
        });
        log.info("最后1222")
    }
    /**

src/server/resources/config/config.ystest.js

@@ -0,0 +1,128 @@
"use strict";
let imDbConfig = {
    host: '172.26.0.195',
    user: 'root',
    port:3306,
    password: 'jkzlehr',
    database: 'im_internet_hospital',
    connectionLimit: '100',
    charset : 'utf8mb4'
};
// Redis
let redisConfig = {
    host: '172.26.0.190',
    port: 6379,
    db: 1
};
// let redisConfig = {
//     host: '192.0.33.26',
//     port: 6380,
//     db: 1,
//     password:'Kb6wKDQP1W4'
// };
// 内网Redis
let innerRedisConfig = {
    host: '172.26.0.190',
    port: 6379,
    db: 1
};
// 三师后台
let wlyyServerConfig = {
    host: 'www.xmtyw.cn',
    port: 80,
    model:"/wlyy"
};
//医生助手配置
let wlyyDAServerConfig = {
    host: '192.168.120.167',
    port: 5550,
    model:"/assistant"
};
// 个推AppStore版参数
let getTuiConfig = {
    HOST: 'https://api.getui.com/apiex.htm',
    APPID: 'qWmRh2X88l7HuE36z3qBe8',
    APPKEY: 'EzERfV8c849lBkZqHWzQG1',
    MASTERSECRET: 'veXiajQrId6iojy7Qv8kZ2'
};
// 微信配置
let wechatConfig = {
    appId: 'wxad04e9c4c5255acf',
    appSecret: 'ae77c48ccf1af5d07069f5153d1ac8d3',
    token: '27eb3bb24f149a7760cf1bb154b08040',
    accId: 'gh_ffd64560fb21',
    baseUrl: 'www.xmtyw.cn/wlyy',
    template: {
        consultTemplate: '0mF_vHj-ILx8EH8DwzmAi7LqzjqYiU9IrSRRmziTZyc'  // 咨询回复模板
    }
};
//  第三方微信（模版消息/个推消息）接口配置
//中山医院
let thirdApiMessageConfig = {
    host: '172.16.1.42',
    port: 10023,
    model:"/mqsdk",
    enpoint :"/ehospitalNotice"
};
//企业微信模版消息
let hlwyyDAServerConfig = {
    host: '172.16.1.42',
    port: 10023,
    model:"/enterprise",
    enpoint :"/sendMKMesByDoctor"
};
// 会话配置
let sessionConfig = {
    maxMessageCount: 1000,                  // 会话缓存的消息数量
    maxMessageTimespan: 7 * 24 * 3600,      // 会话缓存的最大时间跨度
    expireTime: 3 * 60 * 60 * 1000,         // 会话过期时间，以毫秒计
    expireSessionCleanCount: 10             // 每次清理多少个过期会话
};
// 议题配置
let topicConfig = {
    TTL: 24,                                // 议题的存活时间，TTL = Time To Live
    TERMINATING_CRON: "* 59 * * * *"        // 议题自动关闭的任务执行时间间隔
};
//IM 客户端医院参数配置
let imClientType = {
    id : "zsyy",
    url : "http://ehr.yihu.com/demo"
}
exports.environment = 'ystest';
exports.pubChannel = 'phone_to_pc';
exports.subChannel = 'pc_to_phone';
exports.pubSubSwitch = true;
exports.app = 'im.server';
exports.version = '2.0.0';
exports.debug = true;
exports.serverPort = 3000;
exports.sessionExpire = 1800;
exports.showSQL = false;
exports.imDbConfig = imDbConfig;
exports.redisConfig = redisConfig;
exports.innerRedisConfig = innerRedisConfig;
exports.getTuiConfig = getTuiConfig;
exports.wlyyServerConfig = wlyyServerConfig;
exports.wlyyDAServerConfig = wlyyDAServerConfig;
exports.hlwyyDAServerConfig = hlwyyDAServerConfig;
exports.wechatConfig = wechatConfig;
exports.thirdApiMessageConfig = thirdApiMessageConfig;
exports.sessionConfig = sessionConfig;
exports.topicConfig = topicConfig;
exports.imClientType = imClientType;