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

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

@@ -117,8 +117,16 @@ class AppClient extends RedisModel {
                //     return;
                // }
                //调用接口推送医生助手微信模板
                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?' + params, 'GET', function (err, res) {
                let param = {
                    sessionId:message.session_id||'',
                    sessionType:sessionType,
                    from:message.sender_id|| '',
                    content:message.content,
                    businessType:message.businessType || 1,
                    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);

src/server/util/wlyyAssistant.sdk.js

@@ -4,6 +4,7 @@
'use strict';
let http = require('http');
let querystring = require('querystring');
let configFile = require('../include/commons').CONFIG_FILE;
let config = require('../resources/config/' + configFile);
let log = require('./log.js');
@@ -11,7 +12,7 @@ let log = require('./log.js');
class WlyyAssistantSDK {
    constructor(){}
    static request(userId, adminToken, token, imei, endpoint, method, handler){
    static request(userId, adminToken, token, imei, endpoint, param, handler){
        let userAgent = {
            admin_token: adminToken,
            token: token,
@@ -19,13 +20,16 @@ class WlyyAssistantSDK {
            imei: imei
        };
        var postData=querystring.stringify(param);
        let options = {
            hostname: config.wlyyDAServerConfig.host,
            port: config.wlyyDAServerConfig.port,
            path: config.wlyyDAServerConfig.model+endpoint,
            method: method,
            method: 'POST',
            headers: {
                'userAgent': JSON.stringify(userAgent)
                'userAgent': JSON.stringify(userAgent),
                'Content-Type': 'application/x-www-form-urlencoded;text/html;charset=utf-8'
            }
        };
@@ -43,7 +47,7 @@ class WlyyAssistantSDK {
            handler(err, null);
        });
        req.write(postData);
        req.end();
    }
}