Merge branch 'feature-refactor' of yeshijie/im.doctor into feature-refactor

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

@@ -238,26 +238,7 @@ class WechatClient extends RedisModel {
        }
        var count = 0;
        if(message.content_type == CONTENT_TYPES.PrescriptionBloodStatus ||message.content_type == CONTENT_TYPES.PrescriptionFollowupContent){
            //续方消息特殊处理
            if(doctorClient&&message.session_id==doctorClient.sessionId){
                WechatClient.updateParticipantLastFetchTime(doctorClient.sessionId, doctorId, ObjectUtil.timestampToLong(message.timestamp));
                doctorClient.socket.emit('message', {
                    id: message.id,
                    session_id: message.session_id,
                    sender_id: message.sender_id,
                    sender_name: message.sender_name,
                    content_type: message.content_type,
                    content: message.content,
                    timestamp: ObjectUtil.timestampToLong(message.timestamp),
                    type: message.content_type,          // legacy support
                    name: message.sender_name,
                });
            }else{
                count++;
            }
        }else if(doctorClient&&sendClient&&sendClient.sessionId==doctorClient.sessionId){
        if(doctorClient&&message.session_id==doctorClient.sessionId){
            WechatClient.updateParticipantLastFetchTime(doctorClient.sessionId, doctorId, ObjectUtil.timestampToLong(message.timestamp));
            doctorClient.socket.emit('message', {
                id: message.id,
@@ -276,26 +257,7 @@ class WechatClient extends RedisModel {
        //发送pc端
        if(message.content_type == CONTENT_TYPES.PrescriptionBloodStatus ||message.content_type == CONTENT_TYPES.PrescriptionFollowupContent){
            //续方消息特殊处理
            if(pc_doctorClient&&message.session_id==pc_doctorClient.sessionId){
                WechatClient.updateParticipantLastFetchTime(pc_doctorClient.sessionId, doctorId, ObjectUtil.timestampToLong(message.timestamp));
                pc_doctorClient.socket.emit('message', {
                    id: message.id,
                    session_id: message.session_id,
                    sender_id: message.sender_id,
                    sender_name: message.sender_name,
                    content_type: message.content_type,
                    content: message.content,
                    timestamp: ObjectUtil.timestampToLong(message.timestamp),
                    type: message.content_type,          // legacy support
                    name: message.sender_name,
                });
            }else{
                count++;
            }
        }else if(pc_doctorClient&&sendClient&&sendClient.sessionId==pc_doctorClient.sessionId){
        if(pc_doctorClient&&message.session_id==pc_doctorClient.sessionId){
            WechatClient.updateParticipantLastFetchTime(pc_doctorClient.sessionId, doctorId, ObjectUtil.timestampToLong(message.timestamp));
            pc_doctorClient.socket.emit('message', {
                id: message.id,

src/server/models/redis/pubSub.js

@@ -52,7 +52,11 @@ class PubSub{
                                    let data = res.data;
                                    count = parseInt(JSON.parse(data.imMsgCount).count) + parseInt(data.system.amount) + parseInt(data.healthIndex.amount) + parseInt(data.sign.amount);
                                }
                                AppClient.sendNotification(message.targetUserId, message,message.sessionType,count);
                                if(config.environment!='local'){//pc版不推送个推，通过redis的publish
                                    AppClient.sendNotification(message.targetUserId, message,message.sessionType,count);
                                }
                                //外网pcim通过socket推送
                                WechatClient.sendPcImSocket(message.targetUserId,message,message.sessionType);
                            });
                        }
                    }