8 роки тому
батько
коміт
b11825e7e5

+ 5 - 4
src/server/models/sessions/participants.js

@ -151,7 +151,7 @@ class Participants extends RedisModel {
    removeUser(sessionId, userId,handler) {
        let self = this;
        let participants_key = RedisModel.makeRedisKey(REDIS_KEYS.SessionParticipants, sessionId);
        let user_session_key = RedisModel.makeRedisKey(REDIS_KEYS.UsersSessions, userId);
        let user_session_key = RedisModel.makeRedisKey(REDIS_KEYS.UserSessions, userId);
        // 移除会话中的成员信息,用户的Session信息及MySQL中的记录
        redis.multi()
@ -243,13 +243,14 @@ class Participants extends RedisModel {
                return;
            }else{
                let session = res[0];
                redis.hgetAsync(oldUserId).then(function(role){
                    self.addUser(sessionId.userId,role,function(err,addResult){
                redis.hgetAsync(participantsRoleKey,oldUserId).then(function(role){
                    if(!role)role = 0;
                    self.addUser(session.id,userId,role,function(err,addResult){
                        if(err){
                            ModelUtil.emitOK(self.eventEmitter, {status:-1,message: "会话成员添加失败!"});
                            return;
                        }
                        self.removeUser(sessionId,oldUserId,function(err,res){
                        self.removeUser(session.id,oldUserId,function(err,res){
                            if(err){
                                ModelUtil.emitOK(self.eventEmitter, {status:-1,message: "会话成员移除失败!"});
                                return;

+ 4 - 2
src/server/repository/mysql/participant.repo.js

@ -217,12 +217,14 @@ class ParticipantRepo {
        });
    }
    static deleteUserFromMysql(sessionId, userId) {
    static deleteUserFromMysql(sessionId, userId,handler) {
        let sql = "delete from " + DB_TABLES.Participants + " where user_id=? and session_id=? ";
        ImDb.execQuery({
            "sql": sql,
            "args": [userId, sessionId],
            "handler": handler
            "handler": handler||function(){
                log.info("deleteUserFromMysql");
            }
        });
    }