Merge branch 'feature-refactor' of http://192.168.1.220:10080/Amoy/im.doctor into feature-refactor

src/server/app.js

@@ -124,9 +124,4 @@ let socketHandler = new SocketHandler(io);
socketHandler.start();
log.info('Starting IM server, version ' + config.version + ', running on port ' + server.address().port + ', ' + new Date().toLocaleString());
log.info('Configuration profile: ' + configFile.split('.')[1]);
var Users =  require('./models/user/users');
let abc = new Users();
abc.isPatientId('not-patient_id');
log.info('Configuration profile: ' + configFile.split('.')[1]);

src/server/endpoints/chats.endpoint.js

@@ -75,7 +75,7 @@ router.get(APIv1.Chats.TEST,function(req,res){
        let user = req.query.user;
        let sessionId =req.query.sessionId;
        let sessions = new Sessions();
        controllerUtil.regModelEventHandler(sessions, res);
        ControllerUtil.regModelEventHandler(sessions, res);
        sessions.getSessionMessages(sessionId,user,page,pagesize);
    }
    //http://192.168.131.107:3008/api/v1/chats/test?test=2&page=0&pagesize=10&user=3121
@@ -84,13 +84,13 @@ router.get(APIv1.Chats.TEST,function(req,res){
        let page = req.query.page;
        let pagesize = req.query.pagesize;
        let user = req.query.user;
        controllerUtil.regModelEventHandler(sessions, res);
        ControllerUtil.regModelEventHandler(sessions, res);
        sessions.getUserSessions(user,page,pagesize);
    }
    //http://192.168.131.107:3008/api/v1/chats/test?test=3&sessionId=132312312&users=10,2,3&name=3121&sessionType=2
    if(test==3){
        let sessions = new Sessions();
        controllerUtil.regModelEventHandler(sessions, res);
        ControllerUtil.regModelEventHandler(sessions, res);
        let sessionId = req.query.sessionId;
        let users = req.query.users;
        let name = req.query.name;
@@ -99,7 +99,7 @@ router.get(APIv1.Chats.TEST,function(req,res){
    }
    if(test==4){
        let sessions = new Sessions();
        controllerUtil.regModelEventHandler(sessions, res);
        ControllerUtil.regModelEventHandler(sessions, res);
        let sessionId = req.query.sessionId;
        let message ={};
        message.contentType =1;
@@ -112,7 +112,7 @@ router.get(APIv1.Chats.TEST,function(req,res){
    //http://192.168.131.107:3008/api/v1/chats/test?test=5&page=0&pagesize=10&user=3121&sessionId=testsessionmsg1
    if(test==5){
        let sessions = new Sessions();
        controllerUtil.regModelEventHandler(sessions, res);
        ControllerUtil.regModelEventHandler(sessions, res);
        let sessionId = req.query.sessionId;
        let user = req.query.user;
        let page = req.query.page;

src/server/models/messages/messages.js

@@ -7,7 +7,7 @@ let RedisClient = require('../../repository/redis/redis.client.js');
let redisClient = RedisClient.redisClient();
let redis = redisClient.connection;
let RedisModel = require('./../redis.model.js');
let modelUtil = require('../../util/modelUtil');
let modelUtil = require('../../util/model.util');
var imDb = require('../../repository/mysql/db/im.db');
let log = require('../../util/log.js');
let Sessions = require('../sessions/sessions');

src/server/models/sessions/participants.js

@@ -7,7 +7,7 @@ let RedisClient = require('../../repository/redis/redis.client.js');
let redisClient = RedisClient.redisClient();
let redis = redisClient.connection;
let RedisModel = require('./../redis.model.js');
let modelUtil = require('../../util/modelUtil');
let modelUtil = require('../../util/model.util');
let imDb = require('../../repository/mysql/db/im.db');
let log = require('../../util/log.js');
const RedisKey = require('../../include/commons').REDIS_KEYS;

src/server/models/sessions/sessions.js

@@ -7,16 +7,15 @@ let RedisClient = require('../../repository/redis/redis.client.js');
let redisClient = RedisClient.redisClient();
let redis = redisClient.connection;
let RedisModel = require('./../redis.model.js');
let modelUtil = require('../../util/modelUtil');
let modelUtil = require('../../util/model.util');
let Messages = require('../messages/messages');
let Participants = require('./Participants');
let imDb = require('../../repository/mysql/db/im.db');
let Participants = require('./Participants')
let log = require('../../util/log.js');
const RedisKeys = require('../../include/commons').REDIS_KEYS;
const Commons = require('../../include/commons');
let configFile = require('../../include/commons').CONFIG_FILE;
let config = require('../../resources/config/' + configFile);
let SessionRepo = require('../repository/mysql/session.repo');
let SessionRepo = require('../../repository/mysql/session.repo');
let mongoose = require('mongoose');
class Sessions extends RedisModel {

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

@@ -10,7 +10,7 @@
let https = require('https');
let configFile = require('../../include/commons').CONFIG_FILE;
let config = require('../resources/config/' + configFile);
let config = require('../../resources/config/' + configFile);
let log = require('../../util/log');

src/server/repository/mysql/db/im.db.js

@@ -15,7 +15,7 @@ class ImDb {
    constructor() {
    }
    static execQuery = function (options) {
    static execQuery (options) {
        dbUtil.execQuery(pool, options);
    };
}

src/server/repository/mysql/private.msg.repo.js

@@ -134,7 +134,7 @@ class PrivateMsgRepo {
     * @param count
     * @param handler
     */
    static findUnread = function (from, to, start, count, handler) {
    static findUnread  (from, to, start, count, handler) {
        var sql = "SELECT msg_id, to_uid, from_uid, type, content, timestamp from msg_p2p " +
            "WHERE from_uid = ? AND to_uid = ? AND msg_id < ? ORDER BY timestamp DESC LIMIT ?";

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

@@ -17,7 +17,7 @@ class SessionRepo {
    static getUserSessionsFromMysql(userId,handler){
        let sql ="select select session_id from participants w where w.participaint_id = ? group by w.session_id";
        let sessionsql = "select id,name,type,create_date from session s where s.id in("+sql+")";
        imDb.execQuery({
        ImDb.execQuery({
            "sql": sessionsql,
            "args": [userId],
            "handler": function (err, res) {
@@ -38,7 +38,7 @@ class SessionRepo {
     */
    static getSessions(sessionId,handler){
        let sessionsql = "select id,name,type,create_date from session s where s.id=?";
        imDb.execQuery({
        ImDb.execQuery({
            "sql": sessionsql,
            "args": [sessionId],
            "handler": function (err, res) {
@@ -62,7 +62,7 @@ class SessionRepo {
     */
    static saveSessionToMysql(sessionId,name,type,createDate){
        let sql ="insert into "+IMTABLE.SESSIONS+" (id,name,type,create_date) VALUES (?,?,?,?) ";
        imDb.execQuery({
        ImDb.execQuery({
            "sql": sql,
            "args": [sessionId,name,type,createDate],
            "handler": function (err, res) {