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

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

@@ -8,7 +8,7 @@ let RedisModel = require('./../redis.model');
let AppStatusRepo = require('../../repository/mysql/app.status.repo');
let ModelUtil = require('../../util/model.util');
let clientCache = require('../socket.io/client.cache').clientCache();
let WlyySDK = require("../../util/wlyy.sdk");
let WlyyAssistantSDK = require("../../util/wlyyAssistant.sdk");
let log = require("../../util/log.js");
let pusher = require('../push/pusher');
@@ -117,7 +117,7 @@ class AppClient extends RedisModel {
                // }
                //调用接口推送医生助手微信模板
                let params = 'sessionId='+(message.session_id||'')+'&sessionType='+sessionType+"&from="+(message.sender_id|| '')+'&content='+message.content+'&businessType='+(message.business_type || 1)+'&doctorCode='+targetId;
                WlyySDK.request('admin', '0a5c5258-8863-4b07-a3f9-88c768528ab4', '', 'admin_imei', '/doctor/feldsher/sendDoctorTemplate?' + params, 'GET', function (err, res) {
                WlyyAssistantSDK.request('admin', '0a5c5258-8863-4b07-a3f9-88c768528ab4', '', 'admin_imei', '/doctor/feldsher/sendDoctorTemplate?' + params, 'GET', function (err, res) {
                    if(err){
                        log.error(err);
                    }else {

src/server/resources/config/config.local.js

@@ -25,6 +25,13 @@ let wlyyServerConfig = {
    model:"/wlyy"
};
//医生助手配置
let wlyyDAServerConfig = {
    host: '27.155.100.191',
    port: 9660,
    model:"/wlyy"
};
// 个推AppStore版参数
let getTuiConfig = {
    HOST: 'https://api.getui.com/apiex.htm',
@@ -76,6 +83,7 @@ exports.redisConfig = redisConfig;
exports.getTuiConfig = getTuiConfig;
exports.wlyyServerConfig = wlyyServerConfig;
exports.wlyyDAServerConfig = wlyyDAServerConfig;
exports.wechatConfig = wechatConfig;
exports.sessionConfig = sessionConfig;
exports.topicConfig = topicConfig;

src/server/resources/config/config.prod.js

@@ -25,6 +25,13 @@ let wlyyServerConfig = {
    model:"/wlyy"
};
//医生助手配置
let wlyyDAServerConfig = {
    host: 'www.xmtyw.cn',
    port: 80,
    model:"/wlyy"
};
// 个推AppStore版参数
let getTuiConfig = {
    HOST: 'https://api.getui.com/apiex.htm',
@@ -76,6 +83,7 @@ exports.redisConfig = redisConfig;
exports.getTuiConfig = getTuiConfig;
exports.wlyyServerConfig = wlyyServerConfig;
exports.wlyyDAServerConfig = wlyyDAServerConfig;
exports.wechatConfig = wechatConfig;
exports.sessionConfig = sessionConfig;
exports.topicConfig = topicConfig;

src/server/resources/config/config.test.js

@@ -23,6 +23,13 @@ let wlyyServerConfig = {
    model:"/wlyy"
};
//医生助手配置
let wlyyDAServerConfig = {
    host: '172.19.103.88',
    port: 9092,
    model:"/wlyy"
};
// 个推AppStore版参数
let getTuiConfig = {
    HOST: 'https://api.getui.com/apiex.htm',
@@ -73,6 +80,7 @@ exports.redisConfig = redisConfig;
exports.getTuiConfig = getTuiConfig;
exports.wlyyServerConfig = wlyyServerConfig;
exports.wlyyDAServerConfig = wlyyDAServerConfig;
exports.wechatConfig = wechatConfig;
exports.sessionConfig = sessionConfig;
exports.topicConfig = topicConfig;

src/server/util/wlyyAssistant.sdk.js

@@ -0,0 +1,51 @@
/**
 * 简易WLYY SDK，提供WLYY接口调用。
 */
'use strict';
let http = require('http');
let configFile = require('../include/commons').CONFIG_FILE;
let config = require('../resources/config/' + configFile);
let log = require('./log.js');
class WlyyAssistantSDK {
    constructor(){}
    static request(userId, adminToken, token, imei, endpoint, method, handler){
        let userAgent = {
            admin_token: adminToken,
            token: token,
            uid: userId,
            imei: imei
        };
        let options = {
            hostname: config.wlyyDAServerConfig.host,
            port: config.wlyyDAServerConfig.port,
            path: config.wlyyDAServerConfig.model+endpoint,
            method: method,
            headers: {
                'userAgent': JSON.stringify(userAgent)
            }
        };
        let req = http.request(options, function (res) {
            res.setEncoding('utf-8');
            res.on('data', function (chunk) {
                log.info('家庭医生助手平台->请求成功:', chunk);
                handler(null, chunk);
            });
        });
        req.on('error', function (err) {
            log.error('家庭医生助手平台->请求失败: ', err.message);
            handler(err, null);
        });
        req.end();
    }
}
module.exports = WlyyAssistantSDK;