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

# Conflicts:
#	src/server/models/client/wechat.client.js

src/server/endpoints/v2/session.endpoint.js

@@ -203,6 +203,7 @@ router.get(APIv2.Sessions.SessionListByType, function (req, res) {
    let userId = req.query.user_id;
    let type = req.query.type;
    let status = req.query.status;
    let name = req.query.name;
    if (!page) {
        throw {httpStatus: 406, message: 'Missing page.'};
    }
@@ -218,7 +219,7 @@ router.get(APIv2.Sessions.SessionListByType, function (req, res) {
    let sessions = new Sessions();
    ControllerUtil.regModelEventHandler(sessions, res);
    sessions.getUserSessionsByType(userId,type,page,size,status);
    sessions.getUserSessionsByType(userId,type,page,size,status,name);
});
router.get(APIv2.Sessions.SessionListByNoParticipant, function (req, res) {

src/server/models/sessions/sessions.js

@@ -789,7 +789,7 @@ class Sessions extends RedisModel {
     * @param businessType
     * @param status 0：进行中的会话1：结束的会话
     */
    getUserSessionsByType(userId,type,page, size,status) {
    getUserSessionsByType(userId,type,page, size,status,name) {
        logger.info("根据用户类型获取用户的session列表1: ");
        let userSessionKey = RedisModel.makeRedisKey(REDIS_KEYS.UserSessions, userId);
        let self = this;
@@ -797,7 +797,7 @@ class Sessions extends RedisModel {
        async.waterfall([
            // 获取会话ID列表
            function (callback) {
                SessionRepo.findListByType(userId,type,page,size,status,function(err,res){
                SessionRepo.findListByType(userId,type,page,size,status,name,function(err,res){
                    logger.info("根据用户类型获取用户的session列表: res :"+res);
                    if (res == null || res.length == 0) {
                        ModelUtil.emitOK(self.eventEmitter, []);

src/server/repository/mysql/session.repo.js

@@ -162,7 +162,7 @@ class SessionRepo {
     * @param type
     * @param handler
     */
    static findListByType(userId, type,page,pagesize, status,handler) {
    static findListByType(userId, type,page,pagesize, status,name,handler) {
        log.info("type="+type);
        if (page > 0) {
            if (page == 1) {
@@ -180,6 +180,10 @@ class SessionRepo {
            sessionSQL += " and s.status="+status
        }
        if(name != null && name != ""){
            sessionSQL += " and s.name like '%"+status+"%'";
        }
        sessionSQL +=  " order by s.last_message_time desc limit "+page+","+pagesize;
        log.info(sessionSQL)
        ImDb.execQuery({

src/server/resources/config/config.prod.js

@@ -1,19 +1,19 @@
"use strict";
let imDbConfig = {
    host: '192.0.33.27',
    user: 'im',
    port:3306,
    password: '2oEq3Kf7',
    database: 'im',
    host: '10.9.1.247',
    user: 'wlyy',
    port:3310,
    password: 'qY#j2n5O',
    database: 'dbo',
    connectionLimit: '100',
    charset : 'utf8mb4'
};
// Redis
let redisConfig = {
    host: '192.0.33.26',
    port: 6390,
    host: '10.9.1.247',
    port: 6380,
    db: 1,
    password:'Kb6wKDQP1W4'
};

src/server/resources/config/config.prod_sdtn.js

@@ -0,0 +1,140 @@
"use strict";
let imDbConfig = {
    host: '10.9.1.247',
    user: 'wlyy',
    port:3310,
    password: 'qY#j2n5O',
    database: 'im',
    connectionLimit: '100',
    charset : 'utf8mb4'
};
// Redis
let redisConfig = {
    host: '10.9.1.247',
    port: 6380,
    db: 1,
    password:'Kb6wKDQP1W4'
};
// let redisConfig = {
//     host: '192.0.33.26',
//     port: 6380,
//     db: 1,
//     password:'Kb6wKDQP1W4'
// };
// 内网Redis
let innerRedisConfig = {
    host: '192.0.33.26',
    port: 6390,
    db: 1,
    password:'Kb6wKDQP1W4'
};
// 三师后台
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"
};
//  第三方微信（模版消息/个推消息）接口配置
// 厦门i健康模板消息
let xmIjkTemplateConfig = {
    host: 'www.xmtyw.cn',
    port: 80,
    model:"/wlyy",
    enpoint :"/im/common/message/sendWxTemple"
};
//企业微信模版消息
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 : "https://hlwyy.xmzsh.com"
}
exports.environment = 'prod';
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;
exports.xmIjkTemplateConfig = xmIjkTemplateConfig