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

src/server/models/client/app.client.js

@@ -104,14 +104,15 @@ class AppClient extends RedisModel {
            doctorCode:targetId
        }
        // let params = 'sessionId='+(message.session_id||'')+'&sessionType='+sessionType+"&from="+(message.sender_id|| '')+'&content='+message.content+'&businessType='+(message.business_type || 1)+'&doctorCode='+targetId;
        WlyyAssistantSDK.request('admin', '0a5c5258-8863-4b07-a3f9-88c768528ab4', '', 'admin_imei', '/doctor/feldsher/sendDoctorTemplate', param, function (err, res) {
            // WlyySDK.request('admin', '0a5c5258-8863-4b07-a3f9-88c768528ab4', '', 'admin_imei', '/doctor/feldsher/sendDoctorTemplate?' + params, 'GET', function (err, res) {
            if(err){
                log.error(err);
            }else {
                log.info(res);
            }
        });
        // 医生助手有自己的模板消息，不需要通过im发送
        // WlyyAssistantSDK.request('admin', '0a5c5258-8863-4b07-a3f9-88c768528ab4', '', 'admin_imei', '/doctor/feldsher/sendDoctorTemplate', param, function (err, res) {
        //     // WlyySDK.request('admin', '0a5c5258-8863-4b07-a3f9-88c768528ab4', '', 'admin_imei', '/doctor/feldsher/sendDoctorTemplate?' + params, 'GET', function (err, res) {
        //     if(err){
        //         log.error(err);
        //     }else {
        //         log.info(res);
        //     }
        // });
        if (!userStatus) {
            log.warn("User's app status is not found, user id: " + targetId + ", maybe user never login yet or logout?");
@@ -167,7 +168,7 @@ class AppClient extends RedisModel {
                    ModelUtil.logError("Get user app status failed", err);
                    return;
                }
                var isSend = true;
                var session_type = isNaN(Number(sessionType))?sessionType:Number(sessionType);
                if(session_type==SESSION_TYPES.SYSTEM||
                    session_type==SESSION_TYPES.MUC||
@@ -183,15 +184,17 @@ class AppClient extends RedisModel {
                            let family_topic_switch = res[0].family_topic_switch;
                            if(master_switch==0||im_switch==0){
                                ModelUtil.logError(targetId+"-关闭im消息，消息id", message.id);
                            }else if(session_type==SESSION_TYPES.MUC&&family_topic_switch==1){
                                SignFamilyRepo.isHealthDoctor(message.session_id,targetId,function (err,res) {
                                    if(res&&res.length==0){
                                        ModelUtil.logError("全科医生："+targetId+"-关闭im消息，消息id", message.id);
                                    }else{
                                        AppClient.sendNotice(targetId, message, sessionType,badge,userStatus)
                                    }
                                })
                            }else{
                            }
                            // else if(session_type==SESSION_TYPES.MUC&&family_topic_switch==1){
                            //     SignFamilyRepo.isHealthDoctor(message.session_id,targetId,function (err,res) {
                            //         if(res&&res.length==0){
                            //             ModelUtil.logError("全科医生："+targetId+"-关闭im消息，消息id", message.id);
                            //         }else{
                            //             AppClient.sendNotice(targetId, message, sessionType,badge,userStatus)
                            //         }
                            //     })
                            // }
                            else{
                                AppClient.sendNotice(targetId, message, sessionType,badge,userStatus)
                            }
                        }

src/server/resources/config/config.dev.js

@@ -105,7 +105,7 @@ let topicConfig = {
exports.environment = 'dev';
exports.pubChannel = 'dev';
exports.subChannel = 'test';
exports.pubSubSwitch = true;
exports.pubSubSwitch = false;
exports.app = 'IM.Server';
exports.version = '2.0.0';