Merge branch 'feature-refactor' of http://192.168.1.220:10080/Amoy/im.doctor into feature-refactor

src/server/include/commons.js

@@ -35,6 +35,7 @@ const SESSION_TYPES = {
    SPECIALISTGROUP: 5,       // 专科医生和家庭医生的固定组
    PRESCRIPTION: 8,   // 续方
    PRESCRIPTION_HOSPITAL:9, //医院在线复诊
    SCREENING_REFERRAL:1037, //筛查转诊
    ONDOOR_NURSING:11   //上门护理
};
@@ -231,6 +232,8 @@ const DB_TABLES = {
            return DB_TABLES.MucMessages;
        else if (sessionType == SESSION_TYPES.P2P)
            return DB_TABLES.P2pMessages;
        else if (sessionType == SESSION_TYPES.SCREENING_REFERRAL)
            return DB_TABLES.P2pMessages;
        else if (sessionType == SESSION_TYPES.GROUP)
            return DB_TABLES.GroupMessages;
        else if (sessionType == SESSION_TYPES.DISCUSSION)

src/server/models/sessions/sessions.js

@@ -132,7 +132,7 @@ class Sessions extends RedisModel {
        }
        function callBusinessType(sessionId) {
            if(type == SESSION_TYPES.MUC||type == SESSION_TYPES.PRESCRIPTION || SESSION_TYPES.PRESCRIPTION_HOSPITAL || SESSION_TYPES.ONDOOR_NURSING){
            if(type == SESSION_TYPES.MUC||type == SESSION_TYPES.PRESCRIPTION || type ==SESSION_TYPES.PRESCRIPTION_HOSPITAL || type ==SESSION_TYPES.ONDOOR_NURSING){
                callCreate(sessionId, SESSION_BUSINESS_TYPE.PATIENT);
            }else if(type==SESSION_TYPES.DISCUSSION||type==SESSION_TYPES.GROUP){
                callCreate(sessionId, SESSION_BUSINESS_TYPE.DOCTOR);
@@ -147,7 +147,7 @@ class Sessions extends RedisModel {
            let createDate = new Date();
            Participants.saveParticipantsToRedis(sessionId, participantArray, createDate, function (res) {
                let sessionKey = RedisModel.makeRedisKey(REDIS_KEYS.Session, sessionId);
                if (type == SESSION_TYPES.MUC||type == SESSION_TYPES.PRESCRIPTION || SESSION_TYPES.PRESCRIPTION_HOSPITAL || SESSION_TYPES.ONDOOR_NURSING) {
                if (type == SESSION_TYPES.MUC||type == SESSION_TYPES.PRESCRIPTION || type ==SESSION_TYPES.PRESCRIPTION_HOSPITAL || type ==SESSION_TYPES.ONDOOR_NURSING) {
                    businessType = 2;
                }
                let session = {
@@ -1491,7 +1491,7 @@ class Sessions extends RedisModel {
                            });
                        });
                    }
                    if(sessionType == SESSION_TYPES.MUC || sessionType == SESSION_TYPES.PRESCRIPTION || SESSION_TYPES.PRESCRIPTION_HOSPITAL || SESSION_TYPES.ONDOOR_NURSING){
                    if(sessionType == SESSION_TYPES.MUC || sessionType == SESSION_TYPES.PRESCRIPTION || sessionType == SESSION_TYPES.PRESCRIPTION_HOSPITAL || sessionType == SESSION_TYPES.ONDOOR_NURSING){
                        if(message.content_type == CONTENT_TYPES.PlainText ||
                           message.content_type == CONTENT_TYPES.Image ||
                           message.content_type == CONTENT_TYPES.Audio||
@@ -1834,6 +1834,12 @@ class Sessions extends RedisModel {
                message.targetUserName = targetUserName;
                message.sessionType = sessionType;
                message.targetType = 'patient';
                if(sessionType==SESSION_TYPES.MUC){
                    //调i健康接口，保存管理人员
                    WlyySDK.request(targetUserId, '', '', '', '/im/common/message/managePatient?patient='+targetUserId, 'GET', function (err, res) {
                    });
                }
            } else {
                if(sessionType==SESSION_TYPES.P2P){
                     WechatClient.sendReadDoctorByDoctorId(targetUserId, message);

src/server/resources/config/config.yanshi.js

@@ -0,0 +1,98 @@
"use strict";
let imDbConfig = {
    host: '172.26.0.195',
    user: 'root',
    password: 'jkzlehr',
    database: 'im_new',
    connectionLimit: '50',
    charset: 'utf8mb4'
};
// Redis
let redisConfig = {
    host: '172.26.0.190',
    port: 6379,
    db: 1
};
// let redisConfig = {
//     host: '192.168.1.220',
//     port: 6379,
//     db: 1
// };
// 内网Redis
let innerRedisConfig = {
    host: '172.26.0.190',
    port: 6379,
    db: 1
};
// 三师后台
let wlyyServerConfig = {
    host: '172.26.0.192',
    port: 8080,
    model:"/wlyy"
};
//医生助手配置
let wlyyDAServerConfig = {
    host: '172.26.0.192',
    port: 8080,
    model:"/wlyy"
};
// 个推AppStore版参数
let getTuiConfig = {
    HOST: 'https://api.getui.com/apiex.htm',
    APPID: 'H6FYbDejks6VjMmW3uH7V6',
    APPKEY: '0PFWlKmLBN9YzhCfFWVgYA',
    MASTERSECRET: 'pvjCGtRZJx9SRVODkxc816'
};
// 微信配置
let wechatConfig = {
    appId: 'wx0a06b75a40b28f2a',
    appSecret: '34debe2ea604db629c0e17e0e5fc99d7',
    token: '27eb3bb24f149a7760cf1bb154b08040',
    accId: 'gh_9386c9ab884f',
    baseUrl: 'ehr.yihu.com/yswlyy',
    template: {
        consultTemplate: 'fadxatOcyNG3ihvJg-OZsq8EzQyLDNljogv6V-Hxshc'  // 咨询回复模板
    }
};
// 会话配置
let sessionConfig = {
    maxMessageCount: 1000,                  // 会话缓存的消息数量
    maxMessageTimespan: 7 * 24 * 3600,      // 会话缓存的最大时间跨度
    expireSessionCleanCount: 10             // 每次清理多少个过期会话
};
// 议题配置
let topicConfig = {
    TTL: 24,                                // 议题的存活时间，TTL = Time To Live
    TERMINATING_CRON: "* 30 * * * *"        // 议题自动关闭的任务执行时间间隔
};
exports.environment = 'test';
exports.pubChannel = 'test';
exports.subChannel = 'dev';
exports.pubSubSwitch = false;
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.wechatConfig = wechatConfig;
exports.sessionConfig = sessionConfig;
exports.topicConfig = topicConfig;