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

# Conflicts:
#	src/server/models/client/wechat.client.js

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

@@ -201,7 +201,8 @@ class WechatClient extends RedisModel {
            timestamp: ObjectUtil.timestampToLong(message.timestamp),
            type: message.content_type,          // legacy support
            name: message.sender_name,
            sender_img : message.sender_img
            sender_img : message.sender_img,
            extend:message.extend
        });
    }
@@ -351,6 +352,7 @@ class WechatClient extends RedisModel {
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                extend:message.extend
            });
        }else{
            count++;
@@ -371,6 +373,7 @@ class WechatClient extends RedisModel {
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                extend:message.extend
            });
        }else{
            count++;
@@ -408,7 +411,8 @@ class WechatClient extends RedisModel {
                name: message.sender_name,
                patient_name:message.patient_name,
                patient_age:message.patient_age,
                patient_sex:message.patient_sex
                patient_sex:message.patient_sex,
                extend:message.extend
            });
        }
@@ -427,7 +431,8 @@ class WechatClient extends RedisModel {
                name: message.sender_name,
                patient_name:message.patient_name,
                patient_age:message.patient_age,
                patient_sex:message.patient_sex
                patient_sex:message.patient_sex,
                extend:message.extend
            });
        }
@@ -465,7 +470,8 @@ class WechatClient extends RedisModel {
                    name: message.sender_name,
                    patient_name:message.patient_name,
                    patient_age:message.patient_age,
                    patient_sex:message.patient_sex
                    patient_sex:message.patient_sex,
                    extend:message.extend
                });
@@ -507,6 +513,7 @@ class WechatClient extends RedisModel {
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                extend:message.extend
            });
        }else{
            count++;
@@ -526,6 +533,7 @@ class WechatClient extends RedisModel {
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                extend:message.extend
            });
        }else{
            count++;
@@ -562,6 +570,7 @@ class WechatClient extends RedisModel {
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                extend:message.extend
            });
        }else{
            patientcount++;
@@ -581,6 +590,7 @@ class WechatClient extends RedisModel {
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                extend:message.extend
            });
        }else{
            patientcount++;
@@ -611,6 +621,7 @@ class WechatClient extends RedisModel {
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                extend:message.extend
            });
        }else{
            doctorcount++;
@@ -631,6 +642,7 @@ class WechatClient extends RedisModel {
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                extend:message.extend
            });
        }else{
            doctorcount++;
@@ -666,6 +678,7 @@ class WechatClient extends RedisModel {
                timestamp: ObjectUtil.timestampToLong(message.timestamp),
                type: message.content_type,          // legacy support
                name: message.sender_name,
                extend:message.extend
            });
        }else{
            mdtDoctorCount++;

src/server/models/messages/messages.js

@@ -103,6 +103,7 @@ class Messages extends RedisModel {
        log.info("  message.sender_id = " + message.sender_id);
        log.info("  message.sender_name= " + message.sender_name);
        log.info("  message.timestamp.getTime() = " + message.timestamp.getTime());
        log.info("  message.extend = " + message.extend);
        let msgJson = {
            id: message.id,
            sender_id: message.sender_id,
@@ -110,7 +111,8 @@ class Messages extends RedisModel {
            timestamp: message.timestamp.getTime(),
            content_type: message.content_type,
            content: message.content,
            business_type:message.business_type||1
            business_type:message.business_type||1,
            extend:message.extend
        };
        redis.multi()