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

src/server/app.js

@@ -42,6 +42,11 @@ app.use(cookieParser());
app.use(express.static(path.join(__dirname, 'public')));
app.use(methodOverride(null, {methods: ['GET', 'POST', 'PUT', 'DELETE']}));
//禁止options请求
app.options('*', (req, res) => {
    res.status(406)
        .send({message: "禁止options"});
});
// web pages and endpoint
UrlInitializer.initWebPages(app);
UrlInitializer.initRestApi(app);

src/server/include/commons.js

@@ -21,6 +21,8 @@ if (process.env.IM_PROFILE === "prod") {
    configFile += "ystest";
} else if (process.env.IM_PROFILE === "hzprod") {
    configFile += "hzprod";
} else if (process.env.IM_PROFILE === "dsyy") {
    configFile += "dsyy";
} else {
    configFile += "test";
}
@@ -52,6 +54,8 @@ const SESSION_TYPES = {
    ONLINE:23, //新生儿在线咨询
    ONLINEAged:24, //老人在线咨询
    HEALTHAged:25, //老人健康咨询
    VIP_GUIDANCE_ASSISTANT:26, //专属服务导诊（专属候诊室）
    ONLINE_WAITING_ROOM:27, //在线候诊室
    contantsType: function (session_type) {
        if( session_type==SESSION_TYPES.MUC||
            session_type==SESSION_TYPES.P2P||
@@ -67,6 +71,8 @@ const SESSION_TYPES = {
            session_type==SESSION_TYPES.PRESCRIPTION_HOSPITAL_VIDEO||
            session_type==SESSION_TYPES.MUC_VIDEO||
            session_type==SESSION_TYPES.GUIDANCE_ASSISTANT||
            session_type==SESSION_TYPES.VIP_GUIDANCE_ASSISTANT||
            session_type==SESSION_TYPES.ONLINE_WAITING_ROOM||
            session_type==SESSION_TYPES.EMERGENCY_ASSISTANCE||
            session_type==SESSION_TYPES.DOOR_COACH||
            session_type==SESSION_TYPES.ONLINE||
@@ -89,6 +95,8 @@ const SESSION_TYPES = {
            sessionType == SESSION_TYPES.MUC_VIDEO ||
            sessionType == SESSION_TYPES.ONDOOR_NURSING||
            sessionType == SESSION_TYPES.GUIDANCE_ASSISTANT||
            sessionType == SESSION_TYPES.VIP_GUIDANCE_ASSISTANT||
            sessionType == SESSION_TYPES.ONLINE_WAITING_ROOM||
            sessionType == SESSION_TYPES.EMERGENCY_ASSISTANCE||
            sessionType == SESSION_TYPES.DOOR_COACH||
            sessionType == SESSION_TYPES.ONLINE||
@@ -186,6 +194,9 @@ const CONTENT_TYPES = {
    SystemMessagePushAssistance:999,// 系统推送消息统一   999  Pad 使用
    DeviceMessagePushAssistance:991,// 设备消息统一推送   991  Pad 使用
    EmergencyAssistanceMessage:43,//云招呼-预警消息
    KnowCommonQuestion:3001,//知识库-常见问题
    KnowCommonQuestions:3002,//知识库-常见问题集
    KnowCommonDict:3003,//知识库-字典
    typeToDescription: function (type, defaultDescription) {
        if (CONTENT_TYPES.Image == type) {
            return '[图片]';

src/server/models/client/wechat.client.js

@@ -88,7 +88,11 @@ class WechatClient extends RedisModel {
            message.content_type==CONTENT_TYPES.PersonalCard||
            message.content_type==CONTENT_TYPES.Video||
            message.content_type==CONTENT_TYPES.PrescriptionInfo||
            message.content_type==CONTENT_TYPES.PrescriptionDiagnosis||message.content_type==CONTENT_TYPES.EmergencyAssistanceMessage
            message.content_type==CONTENT_TYPES.PrescriptionDiagnosis||
            message.content_type==CONTENT_TYPES.EmergencyAssistanceMessage||
            message.content_type==CONTENT_TYPES.KnowCommonQuestion||
            message.content_type==CONTENT_TYPES.KnowCommonQuestions||
            message.content_type==CONTENT_TYPES.KnowCommonDict
            )) {
            let patientClient = clientCache.findById(targetUserId);
            let pc_patientClient = clientCache.findById("pcpatient_"+targetUserId);
@@ -1285,6 +1289,9 @@ class WechatClient extends RedisModel {
                        message.content_type==CONTENT_TYPES.PrescriptionSuggest||
                        message.content_type==CONTENT_TYPES.ConsultSuggest||
                        message.content_type==CONTENT_TYPES.Article||
                        message.content_type==CONTENT_TYPES.KnowCommonQuestion||
                        message.content_type==CONTENT_TYPES.KnowCommonQuestions||
                        message.content_type==CONTENT_TYPES.KnowCommonDict||
                        message.content_type==CONTENT_TYPES.surveyMessage||message.content_type==CONTENT_TYPES.EmergencyAssistanceMessage)){
                        log.info("内容类型122："+message.content_type);
                        let userName = map.get("name");
@@ -1391,6 +1398,9 @@ class WechatClient extends RedisModel {
                        message.content_type==CONTENT_TYPES.PrescriptionSuggest||
                        message.content_type==CONTENT_TYPES.ConsultSuggest||
                        message.content_type==CONTENT_TYPES.Article||
                        message.content_type==CONTENT_TYPES.KnowCommonQuestion||
                        message.content_type==CONTENT_TYPES.KnowCommonQuestions||
                        message.content_type==CONTENT_TYPES.KnowCommonDict||
                        message.content_type==CONTENT_TYPES.surveyMessage||message.content_type==CONTENT_TYPES.EmergencyAssistanceMessage)){
                        log.info("内容类型122："+message.content_type);
                        let title = "您好，收到一条【"+senderName+"】发来的一条消息";

src/server/resources/config/config.dsyy.js

@@ -0,0 +1,128 @@
"use strict";
let imDbConfig = {
    host: '127.0.0.1',
    user: 'wlyy',
    password: '2oEq3Kf7@zjxl',
    database: 'im',
    connectionLimit: '50',
    charset: 'utf8mb4'
};
// Redis
let redisConfig = {
    host: '127.0.0.1',
    port: 6380,
    db: 1,
    password:'Kb6wKDQP1W4'
};
// 内网Redis
let innerRedisConfig = {
    host: '127.0.0.1',
    port: 6380,
    db: 1,
    password:'Kb6wKDQP1W4'
};
// 三师后台
let wlyyServerConfig = {
    host: '174',
    port: 8080,
    model:"/wlyy"
};
//医生助手配置
let wlyyDAServerConfig = {
    host: '17104',
    port: 8080,
    model:"/wlyy"
};
// 个推AppStore版参数
let getTuiConfig = {
    HOST: 'https://api.getui.com/apiex.htm',
    APPID: 'H6FYbDejks6VjMmW3uH7V6',
    APPKEY: '0PFWlKmLBN9YzhCfFWVgYA',
    MASTERSECRET: 'pvjCGtRZJx9SRVODkxc816'
};
// 微信配置
let wechatConfig = {
    appId: 'wx1f129f7b51701428',
    appSecret: '988f005d8309ed1795939e0f042431fb',
    token: '27eb3bb24f149a7760cf1bb154b08040',
    accId: 'gh_ffd64560fb21',
    baseUrl: 'ehr.yihu.com/wlyy',
    template: {
        consultTemplate: '-dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18'  // 咨询回复模板
    }
};
// 会话配置
let sessionConfig = {
    maxMessageCount: 1000,                  // 会话缓存的消息数量
    maxMessageTimespan: 7 * 24 * 3600,      // 会话缓存的最大时间跨度
    expireSessionCleanCount: 10             // 每次清理多少个过期会话
};
// 议题配置
let topicConfig = {
    TTL: 24,                                // 议题的存活时间，TTL = Time To Live
    TERMINATING_CRON: "* 30 * * * *"        // 议题自动关闭的任务执行时间间隔
};
//IM 客户端医院参数配置
let imClientType = {
    id : "hz_cloudCare",
    url : "http://1107"
}
let thirdApiMessageConfig = {
    host: '172.07',
    port: 10301,
    model:"/wxpush",
    enpoint :"/sendWXTemplate"
};
let familyP2PMessageConfig = {
    host: '10.41',
    port: 10301,
    model:"/wxpush",
    enpoint :"/sendFamilyWxTemplate"
};
let hlwyyDAServerConfig = {
    host: '17107',
    port: 10301,
    model:"/im/patient",
    enpoint :"/sendGetuiMessage"
};
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.httpsOpen = false;
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;
exports.imClientType = imClientType;
exports.thirdApiMessageConfig = thirdApiMessageConfig;
exports.hlwyyDAServerConfig = hlwyyDAServerConfig;
exports.familyP2PMessageConfig = familyP2PMessageConfig;