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/resources/config/config.prod.js

@@ -74,6 +74,15 @@ let thirdApiMessageConfig = {
    enpoint :"/ehospitalNotice"
};
//  第三方微信（模版消息/个推消息）接口配置
// 厦门i健康模板消息
let xmIjkTemplateConfig = {
    host: 'www.xmtyw.cn',
    port: 80,
    model:"/wlyy",
    enpoint :"/im/common/message/sendWxTemple"
};
//企业微信模版消息
let hlwyyDAServerConfig = {
    host: '172.16.1.42',
@@ -127,4 +136,5 @@ exports.wechatConfig = wechatConfig;
exports.thirdApiMessageConfig = thirdApiMessageConfig;
exports.sessionConfig = sessionConfig;
exports.topicConfig = topicConfig;
exports.imClientType = imClientType;
exports.imClientType = imClientType;
exports.xmIjkTemplateConfig = xmIjkTemplateConfig

src/server/util/hlwyyWechatAssistant.sdk.js

@@ -40,6 +40,30 @@ class HlwyyWechatAssistantSDK {
                log.error('请求居民微信模版消息发送模版消息->请求失败:', error.message);
            }
        });
        log.info("9:"+config.imClientType.id);
        if(config.imClientType.id == 'zsyy'){
            log.info("10:进入i健康模板消息推送");
            //i健康模板消息推送
            wechatreqq({
                url: "http://"+config.xmIjkTemplateConfig.host+":"+config.xmIjkTemplateConfig.port+config.xmIjkTemplateConfig.model+config.xmIjkTemplateConfig.enpoint+"?"+params,
                json: true,
                headers: {
                    "content-type": "application/json",
                },
                method: 'POST',
                body: JSON.stringify(params)
            }, function(error, response, body) {
                if (!error && response.statusCode == 200) {
                    log.info('请求居民微信模版消息接口发送模版消息->请求成功:', body);
                    // console.log(body) // 请求成功的处理逻辑
                }else{
                    // log.error('请求居民微信模版消息发送模版消息->请求失败:', body.toString());
                    // log.error('请求居民微信模版消息发送模版消息->请求失败:', response.toString());
                    log.error('请求居民微信模版消息发送模版消息->请求失败:', error.message);
                }
            });
            log.info("11:结束i健康模板消息推送");
        }
    }
}