Merge branch 'feature-1.2.6' of Amoy/im.doctor into dev

src/doctor/include/commons.js

@@ -34,9 +34,10 @@ exports.CONTENT_TYPE = {
    SessionEnd: 7,  // 咨询结束
    TransSessionBegin:8,//邀请医生咨询开始
    TransImg:9,//求助医生图片信息
    D_CT_01:"D_CT_01",//您有新的指定咨询
    commaValues: function () {
        return "1,2,3,4,5,6,7";
        return "1,2,3,4,5,6,7,8,9";
    }
};

src/doctor/models/doctor.js

@@ -98,7 +98,9 @@ class Doctor extends BaseModel {
     * @param channel
     */
    static pushMessage(message, channel){
        if(message.contentType==CONTENT_TYPES.SessionBegin||message.contentType==CONTENT_TYPES.SessionEnd||message.contentType==CONTENT_TYPES.TransSessionBegin){
        if(message.contentType==CONTENT_TYPES.SessionBegin
            ||message.contentType==CONTENT_TYPES.SessionEnd
            ||message.contentType==CONTENT_TYPES.TransSessionBegin){
            //开始和结束不做推送
            log.info('message type equ 6 or 7 or 8 not send');
            return;
@@ -126,9 +128,9 @@ class Doctor extends BaseModel {
            let title = '新消息';
            let content = message.content;
            if (message.contentType === CONTENT_TYPES.Image||message.contentType==CONTENT_TYPES.TransImg) {
            if (message.contentType == CONTENT_TYPES.Image||message.contentType==CONTENT_TYPES.TransImg) {
                content = '[图片]';
            } else if (message.contentType === CONTENT_TYPES.Audio) {
            } else if (message.contentType == CONTENT_TYPES.Audio) {
                content = '[语音]';
            } else if (message.contentType > 3) {
                content = '您有一条新消息';

src/doctor/resources/config/config.prod.js

@@ -69,4 +69,5 @@ exports.imDbConfig = imDbConfig;
exports.geTuiConfig = geTuiConfig;
exports.geTuiAppStoreCfg = geTuiAppStoreCfg;
exports.wlyyServerConfig = wlyyServerConfig;
exports.transServerConfig = transServerConfig;
exports.transServerConfig = transServerConfig;
exports.wechatConfig = wechatConfig;