错误代码修正，修改引用信息

src/server/endpoints/v2/topic.endpoint.js

@@ -58,9 +58,9 @@ router.post(APIv2.Sessions.Topics, function (req, res) {
router.get(APIv2.Sessions.TopicEnded, function (req, res) {
    let data = req.body;
    let endUser = data.endUser;
    let endUserName = data.endUserName;
    let topicId = data.topicId;
    let endUser = data.end_user;
    let endUserName = data.end_user_name;
    let topicId = data.topic_id;
    let topic = new Topics();
    ControllerUtil.regModelEventHandler(topic, res);
    topic.endTopic(topicId, endUser, endUserName);

src/server/models/messages/messages.js

@@ -6,7 +6,6 @@
let MessageRepo = require('../../repository/mysql/message.repo');
let RedisModel = require('./../redis.model.js');
let RedisClient = require('../../repository/redis/redis.client.js');
let Sessions = require('../sessions/sessions');
let redis = RedisClient.redisClient().connection;
let log = require('../../util/log.js');

src/server/models/sessions/sessions.js

@@ -18,7 +18,7 @@ let logger = require('../../util/log.js');
let mongoose = require('mongoose');
var async = require("async");
var ObjectUtil = require("../../util/object.util.js");
let MessageRepo = require('../../repository/mysql/message.repo');
const REDIS_KEYS = require('../../include/commons').REDIS_KEYS;
const SESSION_TYPES = require('../../include/commons').SESSION_TYPES;
const STICKY_SESSION_BASE_SCORE = require('../../include/commons').STICKY_SESSION_BASE_SCORE;
@@ -47,7 +47,6 @@ class Sessions extends RedisModel {
            for (let i in participantArray) {
                participantIdArray.push(participantArray[i].split(":")[0]);
            }
            if (participantIdArray.length != 2) {
                ModelUtil.emitDataNotFound(self.eventEmitter, {message: "P2P session only allow 2 participants."});
                return false;
@@ -248,8 +247,16 @@ class Sessions extends RedisModel {
        let message_timestamp_key = RedisModel.makeRedisKey(REDIS_KEYS.MessagesByTimestamp, sessionId);
        if (!start_msg_id && !end_msg_id) {
            redis.zrevrangeAsync(message_timestamp_key, 0, 0).then(function (res) {
                if(res.length==0){
                    ModelUtil.emitOK(self.eventEmitter, res);
                    return;
                }
                start_msg_id = res[0];
                redis.zrangeAsync(message_timestamp_key, 0, 0).then(function (res) {
                    if(res.length==0){
                        ModelUtil.emitOK(self.eventEmitter, res);
                        return;
                    }
                    end_msg_id = res[0];
                    self.getMessagesByPage(sessionId, user, start_msg_id, end_msg_id, page, pagesize, function (err, res) {
                        if (err) {
@@ -263,6 +270,10 @@ class Sessions extends RedisModel {
            })
        } else if (!start_msg_id) {
            redis.zrevrangeAsync(message_timestamp_key, 0, 0).then(function (res) {
                if(res.length==0){
                    ModelUtil.emitOK(self.eventEmitter, res);
                    return;
                }
                start_msg_id = res[0];
                self.getMessagesByPage(sessionId, user, startMsgId, endMsgId, page, pagesize, function (err, res) {
                    if (err) {
@@ -275,6 +286,10 @@ class Sessions extends RedisModel {
            })
        } else if (!end_msg_id) {
            redis.zrangeAsync(message_timestamp_key, 0, 0).then(function (res) {
                if(res.length==0){
                    ModelUtil.emitOK(self.eventEmitter, res);
                    return;
                }
                end_msg_id = res[0];
                self.getMessagesByPage(sessionId, user, start_msg_id, end_msg_id, page, pagesize, function (err, res) {
                    if (err) {

src/server/models/sessions/topics.js

@@ -121,8 +121,8 @@ class Topics extends RedisModel {
         */
        function callBeginMsg(startMsgId) {
            let msg = {};
            msg.sender_id = messages.patient;
            msg.sender_name = messages.patientName;
            msg.sender_id = messages.senderId;
            msg.sender_name = messages.senderName;
            msg.content_type = 1;
            msg.content = messages.description;
            msg.timestamp = new Date();
@@ -134,8 +134,8 @@ class Topics extends RedisModel {
                let imgs = messages.img.split(",");
                for (var j in imgs) {
                    let msgimg = {};
                    msgimg.sender_id = messages.patient;
                    msgimg.sender_name = messages.patientName;
                    msgimg.sender_id = messages.senderId;
                    msgimg.sender_name = messages.senderName;
                    msgimg.content_type = 2;
                    msgimg.content = imgs[j];
                    msgimg.timestamp = new Date();
@@ -182,7 +182,7 @@ class Topics extends RedisModel {
                if (err) {
                    ModelUtil.emitOK(self.eventEmitter, err);
                } else {
                    ModelUtil.emitOK(self.eventEmitter, "结束成功！");
                    ModelUtil.emitOK(self.eventEmitter, msgId);
                    TopicsRepo.endTopic(topicId, endUser, msg.date, msgId);
                }
            })

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

@@ -6,8 +6,7 @@
let configFile = require('../../include/commons').CONFIG_FILE;
let config = require('../../resources/config/' + configFile);
let log = require('../../util/log.js');
let Sessions = require('../../models/sessions/sessions');
let SessionRepo = require('../../repository/mysql/session.repo');
let ImDb = require('../mysql/db/im.db');
const DB_TABLES = require('../../include/commons').DB_TABLES;
@@ -30,7 +29,7 @@ class MessageRepo {
        }
        let session = new Sessions();
        session.getSessions(sessionId, function (err, res) {
        SessionRepo.findOne(sessionId, function (err, res) {
            if (!err) {
                if (res.length == 0) {
                    log.warn("Session is not found!");