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

src/doctor/include/commons.js

@@ -32,6 +32,8 @@ exports.CONTENT_TYPE = {
    GoTo: 5,        // 跳转信息
    SessionBegin: 6,// 咨询开始
    SessionEnd: 7,  // 咨询结束
    TransSessionBegin:8,//邀请医生咨询开始
    TransImg:9,//求助医生图片信息
    commaValues: function () {
        return "1,2,3,4,5,6,7";

src/doctor/models/doctor.js

@@ -98,6 +98,11 @@ 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){
            //开始和结束不做推送
            log.info('message type equ 6 or 7 or 8 not send');
            return;
        }
        doctorRepo.getUserStatus(message.to, function (err, result) {
            if (err) {
                log.error('Lookup notify message receiver failed: ' + message.to);
@@ -121,7 +126,7 @@ class Doctor extends BaseModel {
            let title = '新消息';
            let content = message.content;
            if (message.contentType === CONTENT_TYPES.Image) {
            if (message.contentType === CONTENT_TYPES.Image||message.contentType==CONTENT_TYPES.TransImg) {
                content = '[图片]';
            } else if (message.contentType === CONTENT_TYPES.Audio) {
                content = '[语音]';