Merge branch 'im-internet-hospital-oracle' of huangwenjie/im.doctor into im-internet-hospital-oracle

src/server/models/push/pusher.js

@@ -6,19 +6,19 @@
"use strict";
let RedisModel = require('../redis.model');
let GeTui = require('getui/GT.push');
let Target = require('getui/getui/Target');
let APNTemplate = require('getui/getui/template/APNTemplate');
let BaseTemplate = require('getui/getui/template/BaseTemplate');
let APNPayload = require('getui/payload/APNPayload');
let SimpleAlertMsg = require('getui/payload/SimpleAlertMsg');
let NotyPopLoadTemplate = require('getui/getui/template/NotyPopLoadTemplate');
let LinkTemplate = require('getui/getui/template/LinkTemplate');
let NotificationTemplate = require('getui/getui/template/NotificationTemplate');
let TransmissionTemplate = require('getui/getui/template/TransmissionTemplate');
let SingleMessage = require('getui/getui/message/SingleMessage');
let AppMessage = require('getui/getui/message/AppMessage');
// let GeTui = require('getui/GT.push');
// let Target = require('getui/getui/Target');
//
// let APNTemplate = require('getui/getui/template/APNTemplate');
// let BaseTemplate = require('getui/getui/template/BaseTemplate');
// let APNPayload = require('getui/payload/APNPayload');
// let SimpleAlertMsg = require('getui/payload/SimpleAlertMsg');
// let NotyPopLoadTemplate = require('getui/getui/template/NotyPopLoadTemplate');
// let LinkTemplate = require('getui/getui/template/LinkTemplate');
// let NotificationTemplate = require('getui/getui/template/NotificationTemplate');
// let TransmissionTemplate = require('getui/getui/template/TransmissionTemplate');
// let SingleMessage = require('getui/getui/message/SingleMessage');
// let AppMessage = require('getui/getui/message/AppMessage');
let log = require("../../util/log.js");
let configFile = require('../../include/commons').CONFIG_FILE;
@@ -28,8 +28,8 @@ class Pusher extends RedisModel {
    constructor() {
        super();
        this.getuiConfig = config.getTuiConfig;
        this.gt = new GeTui(this.getuiConfig.HOST, this.getuiConfig.APPKEY, this.getuiConfig.MASTERSECRET);
        // this.getuiConfig = config.getTuiConfig;
        // this.gt = new GeTui(this.getuiConfig.HOST, this.getuiConfig.APPKEY, this.getuiConfig.MASTERSECRET);
    }
    /**
@@ -42,30 +42,30 @@ class Pusher extends RedisModel {
     * @param handler
     */
    pushToSingleViaAPN(message, customData, type, deviceToken,badge, handler) {
        try {
            let simpleAlertMsg = new SimpleAlertMsg();
            simpleAlertMsg.alertMsg = message;
            let payload = new APNPayload();
            payload.alertMsg = simpleAlertMsg;
            payload.badge = badge;
            payload.contentAvailable = 1;
            payload.category = type;
            payload.customMsg.payload1 = customData;
            let template = new APNTemplate();
            template.setApnInfo(payload);
            let singleMessage = new SingleMessage();
            singleMessage.setData(template);
            this.gt.pushAPNMessageToSingle(this.getuiConfig.APPID, deviceToken, singleMessage, function (err, res) {
                if (err) {
                    log.error('Push via APN failed:' + e);
                } else {
                    handler(null, res);
                }
            });
        } catch (e) {
            log.error('Push via APN failed:'+deviceToken+":" + e);
        }
        // try {
        //     let simpleAlertMsg = new SimpleAlertMsg();
        //     simpleAlertMsg.alertMsg = message;
        //
        //     let payload = new APNPayload();
        //     payload.alertMsg = simpleAlertMsg;
        //     payload.badge = badge;
        //     payload.contentAvailable = 1;
        //     payload.category = type;
        //     payload.customMsg.payload1 = customData;
        //     let template = new APNTemplate();
        //     template.setApnInfo(payload);
        //     let singleMessage = new SingleMessage();
        //     singleMessage.setData(template);
        //     this.gt.pushAPNMessageToSingle(this.getuiConfig.APPID, deviceToken, singleMessage, function (err, res) {
        //         if (err) {
        //             log.error('Push via APN failed:' + e);
        //         } else {
        //             handler(null, res);
        //         }
        //     });
        // } catch (e) {
        //     log.error('Push via APN failed:'+deviceToken+":" + e);
        // }
    }
    /**
@@ -79,97 +79,97 @@ class Pusher extends RedisModel {
     * @param handler
     */
    pushToSingleViaAndroid(title, message, customData, clientId, appInBg, handler) {
        if (appInBg == 1) {
            this._pushAndroidNotify(clientId, title, message, customData, handler);
        } else {
            this._pushAndroidTransmission(clientId, customData, handler);
        }
        // if (appInBg == 1) {
        //     this._pushAndroidNotify(clientId, title, message, customData, handler);
        // } else {
        //     this._pushAndroidTransmission(clientId, customData, handler);
        // }
    }
    _pushAndroidNotify(clientId, title, msg, data, handler) {
        let transmissionContent = {
            pushtype: 'notify',
            data: data
        };
        let template = new NotificationTemplate({
            appId: this.getuiConfig.APPID,
            appKey: this.getuiConfig.APPKEY,
            title: title,
            text: msg,
            logo: '',
            isRing: true,
            isVibrate: true,
            isClearable: true,
            transmissionType: 1,
            transmissionContent: JSON.stringify(transmissionContent)
        });
        //个推信息体
        let message = new SingleMessage({
            isOffline: true,                        //是否离线
            offlineExpireTime: 3600 * 12 * 1000,    //离线时间
            data: template,                          //设置推送消息类型
            pushNetWorkType: 0                     //是否wifi ，0不限，1wifi
        });
        //接收方
        let target = new Target({
            appId: this.getuiConfig.APPID,
            clientId: clientId
        });
        this.gt.pushMessageToSingle(message, target, function (err, res) {
            if (err != null && err.exception != null && err.exception instanceof RequestError) {
                let requestId = err.exception.requestId;
                console.log(err.exception.requestId);
                this.gt.pushMessageToSingle(message, target, requestId, function (err, res) {
                    handler(err, res);
                });
            } else {
                handler(err, res);
            }
        });
        // let transmissionContent = {
        //     pushtype: 'notify',
        //     data: data
        // };
        // let template = new NotificationTemplate({
        //     appId: this.getuiConfig.APPID,
        //     appKey: this.getuiConfig.APPKEY,
        //     title: title,
        //     text: msg,
        //     logo: '',
        //     isRing: true,
        //     isVibrate: true,
        //     isClearable: true,
        //     transmissionType: 1,
        //     transmissionContent: JSON.stringify(transmissionContent)
        // });
        //
        // //个推信息体
        // let message = new SingleMessage({
        //     isOffline: true,                        //是否离线
        //     offlineExpireTime: 3600 * 12 * 1000,    //离线时间
        //     data: template,                          //设置推送消息类型
        //     pushNetWorkType: 0                     //是否wifi ，0不限，1wifi
        // });
        //
        // //接收方
        // let target = new Target({
        //     appId: this.getuiConfig.APPID,
        //     clientId: clientId
        // });
        //
        // this.gt.pushMessageToSingle(message, target, function (err, res) {
        //     if (err != null && err.exception != null && err.exception instanceof RequestError) {
        //         let requestId = err.exception.requestId;
        //         console.log(err.exception.requestId);
        //         this.gt.pushMessageToSingle(message, target, requestId, function (err, res) {
        //             handler(err, res);
        //         });
        //     } else {
        //         handler(err, res);
        //     }
        // });
    }
    _pushAndroidTransmission(clientId, customData, handler) {
        let transmissionContent = {
            pushtype: 'transmission',
            data: customData
        };
        let template = new TransmissionTemplate({
            appId: this.getuiConfig.APPID,
            appKey: this.getuiConfig.APPKEY,
            transmissionType: 2,
            transmissionContent: JSON.stringify(transmissionContent)
        });
        // 个推信息实体
        let message = new SingleMessage({
            isOffline: true,                            //是否离线
            offlineExpireTime: 3600 * 12 * 1000,       //离线时间
            data: template,                             //设置推送消息类型
            pushNetWorkType: 0                          //是否wifi ，0不限，1 wifi
        });
        // 接收方
        let target = new Target({
            appId: this.getuiConfig.APPID,
            clientId: clientId
        });
        this.gt.pushMessageToSingle(message, target, function (err, res) {
            if (err != null && err.exception != null && err.exception instanceof RequestError) {
                let requestId = err.exception.requestId;
                log.info("Push android single failed without rquestId, retry with requestId: ", err.exception.requestId);
                this.gt.pushMessageToSingle(message, target, requestId, function (err, res) {
                    if (err) {
                        log.error("Push android single via transmission with requestId failed: ", err);
                    }
                });
            }
        });
        // let transmissionContent = {
        //     pushtype: 'transmission',
        //     data: customData
        // };
        //
        // let template = new TransmissionTemplate({
        //     appId: this.getuiConfig.APPID,
        //     appKey: this.getuiConfig.APPKEY,
        //     transmissionType: 2,
        //     transmissionContent: JSON.stringify(transmissionContent)
        // });
        //
        // // 个推信息实体
        // let message = new SingleMessage({
        //     isOffline: true,                            //是否离线
        //     offlineExpireTime: 3600 * 12 * 1000,       //离线时间
        //     data: template,                             //设置推送消息类型
        //     pushNetWorkType: 0                          //是否wifi ，0不限，1 wifi
        // });
        //
        // // 接收方
        // let target = new Target({
        //     appId: this.getuiConfig.APPID,
        //     clientId: clientId
        // });
        //
        // this.gt.pushMessageToSingle(message, target, function (err, res) {
        //     if (err != null && err.exception != null && err.exception instanceof RequestError) {
        //         let requestId = err.exception.requestId;
        //         log.info("Push android single failed without rquestId, retry with requestId: ", err.exception.requestId);
        //
        //         this.gt.pushMessageToSingle(message, target, requestId, function (err, res) {
        //             if (err) {
        //                 log.error("Push android single via transmission with requestId failed: ", err);
        //             }
        //         });
        //     }
        // });
    }
}

src/server/models/schedule/jobs/topic.terminating.job.js

@@ -6,7 +6,7 @@
 */
"use strict";
let TopicRepo = require('../../../repository/mysql/topics.repo');
let TopicRepo = require('../../../repository/oracle/topics.repo');
let ModelUtil = require("../../../util/model.util.js");
let WlyySDK = require("../../../util/wlyy.sdk");

src/server/models/search/object.searcher.js

@@ -3,7 +3,7 @@
let RedisModel = require('./../redis.model.js');
let ModelUtil = require('../../util/model.util');
let RedisClient = require('../../repository/redis/redis.client.js');
let SearchRepo = require('../../repository/mysql/search.repo');
let SearchRepo = require('../../repository/oracle/search.repo');
let log = require('../../util/log.js');
let async = require("async");

src/server/models/server/management.js

@@ -12,7 +12,7 @@ let config = require('../../resources/config/' + configFile);
let BaseModel = require('../base.model');
let ModeUtil = require("../../util/model.util");
let ImDb = require('../../repository/mysql/db/im.db');
let ImDb = require('../../repository/oracle/db/im.db');
class Management extends BaseModel {
    constructor() {

src/server/models/sessions/participants.js

@@ -7,8 +7,8 @@ let RedisModel = require('./../redis.model.js');
let ModelUtil = require('../../util/model.util');
let RedisClient = require('../../repository/redis/redis.client.js');
let clientCache = require('../socket.io/client.cache').clientCache();
let ParticipantRepo = require('../../repository/mysql/participant.repo');
let SessionRepo = require('../../repository/mysql/session.repo');
let ParticipantRepo = require('../../repository/oracle/participant.repo');
let SessionRepo = require('../../repository/oracle/session.repo');
let log = require('../../util/log.js');
let redis = RedisClient.redisClient().connection;
let Users = require('../user/users');

src/server/models/sessions/sessions.js

@@ -8,13 +8,13 @@ let RedisModel = require('./../redis.model.js');
let ModelUtil = require('../../util/model.util');
let Messages = require('../messages/messages');
let Users = require('../user/users');
let DoctorRepo = require('../../repository/mysql/doctor.repo');
let DoctorRepo = require('../../repository/oracle/doctor.repo');
let Participants = require('./participants');
let SessionRepo = require('../../repository/mysql/session.repo');
let TopicRepo = require('../../repository/mysql/topics.repo');
let MessageRepo = require('../../repository/mysql/message.repo');
let ParticipantRepo = require('../../repository/mysql/participant.repo');
let ImDb = require('../../repository/mysql/db/im.db');
let SessionRepo = require('../../repository/oracle/session.repo');
let TopicRepo = require('../../repository/oracle/topics.repo');
let MessageRepo = require('../../repository/oracle/message.repo');
let ParticipantRepo = require('../../repository/oracle/participant.repo');
let ImDb = require('../../repository/oracle/db/im.db');
let WlyySDK = require("../../util/wlyy.sdk");
let ObjectUtil = require("../../util/object.util.js");

src/server/models/sessions/topics.js

@@ -4,10 +4,10 @@
"use strict";
let RedisClient = require('../../repository/redis/redis.client.js');
let TopicsRepo = require('../../repository/mysql/topics.repo');
let SessionRepo = require('../../repository/mysql/session.repo');
let TopicRepo = require('../../repository/mysql/topics.repo');
let ParticipantRepo = require('../../repository/mysql/participant.repo');
let TopicsRepo = require('../../repository/oracle/topics.repo');
let SessionRepo = require('../../repository/oracle/session.repo');
let TopicRepo = require('../../repository/oracle/topics.repo');
let ParticipantRepo = require('../../repository/oracle/participant.repo');
let RedisModel = require('./../redis.model.js');
let ModelUtil = require('../../util/model.util');
let Sessions = require("./sessions");

src/server/repository/oracle/message.repo.js

@@ -52,15 +52,11 @@ class MessageRepo {
                    where += " AND CONTENT_TYPE=? ";
                    params.push(messageType);
                }
                let sqlTemp = "SELECT rownum r,ID, SESSION_ID, SENDER_ID, SENDER_NAME, CONTENT_TYPE, CONTENT, TIMESTAMP FROM " +
                    MessageTable + " W WHERE " + where + " ORDER BY W.ID ";
                let sql = "SELECT*FROM ( "+sqlTemp+" AND rownum<=?) WHERE r>=?"
                params.push(size);
                params.push(page);
                params.push(size);
                ImDb.execQuery({
                    "sql": sql,
                    "args": params,
@@ -154,10 +150,10 @@ class MessageRepo {
     * @param handler
     */
    static findLastMessage(sessionId,sessionType,handler){
        let sql =
            "SELECT S.CONTENT_TYPE, S.CONTENT,S.AGENT FROM " + DB_TABLES.sessionTypeToTableName(sessionType) + " S " +
            "WHERE S.SESSION_ID = ? ORDER BY S.TIMESTAMP DESC rownum=1 ";
        log.info("获取会话医生的id sql : " + sql);
        log.info("获取会话医生的id args : " + [sessionId]);
        ImDb.execQuery({

src/server/repository/oracle/search.repo.js

@@ -120,9 +120,7 @@ class SearchRepo {
            sql += " AND S.TYPE IN (1,2,8)  AND S.BUSINESS_TYPE = 2 ";
        }
        sql += " AND rownum<=?) WHERE r>=?";
        sql = vsprintf(sql, [userTable == DB_TABLES.Doctors ? ', HOSPITAL_NAME' : '']);
        keyword = '%' + keyword + '%';
@@ -174,13 +172,12 @@ class SearchRepo {
            "FROM SESSIONS S, GROUP_MESSAGES M " +
            "WHERE S.ID IN (?) AND S.ID = M.SESSION_ID AND S.`TYPE` IN (3,5) AND M.CONTENT_TYPE = 1 AND M.CONTENT LIKE ? ) X " +
            "ORDER BY X.SESSION_ID, X.MESSAGE_ID ";
        let sql = "SELECT*FROM ( "+sqlTemp+" AND rownum<=?) WHERE r>=?"
        keyword = '%' + keyword + '%';
        let sql = "SELECT*FROM ( "+sqlTemp+" AND rownum<=?) WHERE r>=?"
        ImDb.execQuery({
            sql: sql,
            args: [sessionIdList, keyword, sessionIdList, keyword, sessionIdList, keyword, size,page * size],
            args: [sessionIdList, keyword, sessionIdList, keyword, sessionIdList, keyword,  size,page * size],
            handler: handler
        });
    }

src/server/repository/oracle/session.repo.js

@@ -159,10 +159,8 @@ class SessionRepo {
        }
        sessionSQL +=  " ORDER BY S.LAST_MESSAGE_TIME DESC "
        let sql = "SELECT*FROM ( "+sessionSQL+" AND rownum<="+pagesize+") WHERE r>="+page
        log.info(sql)
        log.info(sessionSQL)
        ImDb.execQuery({
            "sql": sql,
            "args": [userId],

src/server/repository/oracle/topics.repo.js

@@ -276,8 +276,8 @@ class TopicRepo {
    }
    static findLastTopicStatusAndType(sessionId, handler) {
        let sqlTemp = "SELECT rownum r, ID FROM " + DB_TABLES.Topics + " WHERE  SESSION_ID = ? ORDER BY CREATE_TIME DESC ";
        let sqlTemp = "SELECT rownum r, ID FROM " + DB_TABLES.Topics + " WHERE  SESSION_ID = ? ORDER BY CREATE_TIME DESC ";
        let sql = "SELECT*FROM ( "+sqlTemp+" AND rownum<=1) WHERE r>=0"
        ImDb.execQuery({
            sql: sql,

src/server/repository/oracle/wechat.token.repo.js

@@ -21,10 +21,11 @@ class WeChatTokenRepo {
     * @param handler 回调函数
     */
    static findOne(handler) {
        let sqlTemp = "SELECT rownum r, ACCESS_TOKEN, EXPIRES_IN, ADD_TIMESTAMP FROM WLYY.WX_ACCESS_TOKEN WHERE ACC_ID = '"+config.wechatConfig.accId+"' ORDER BY ADD_TIMESTAMP DESC"
        let sql = "SELECT*FROM ( "+sqlTemp+" AND rownum<=1) WHERE r>=0"
        ImDb.execQuery({
            "sql":
            "sql": sql
            , "handler": handler
        });
    };

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

@@ -1,19 +1,19 @@
"use strict";
let imDbConfig = {
    host: '192.0.33.27',
    user: 'im',
    port:3306,
    password: '2oEq3Kf7',
    database: 'im',
    host: '10.10.10.16',
    user: 'HLWYY',
    port:1521,
    password: 'Xmykzxhlwyy963',
    database: 'rac',
    connectionLimit: '100',
    charset : 'utf8mb4'
};
// Redis
let redisConfig = {
    host: '192.0.33.26',
    port: 6390,
    host: '192.168.33.198',
    port: 6380,
    db: 1,
    password:'Kb6wKDQP1W4'
};
@@ -25,8 +25,8 @@ let redisConfig = {
// };
// 内网Redis
let innerRedisConfig = {
    host: '192.0.33.26',
    port: 6390,
    host: '192.168.33.198',
    port: 6380,
    db: 1,
    password:'Kb6wKDQP1W4'
};
@@ -127,4 +127,4 @@ exports.wechatConfig = wechatConfig;
exports.thirdApiMessageConfig = thirdApiMessageConfig;
exports.sessionConfig = sessionConfig;
exports.topicConfig = topicConfig;
exports.imClientType = imClientType;
exports.imClientType = imClientType;