diff --git a/domain/model/group_m/room.go b/domain/model/group_m/room.go index f23e5d0f7bd33339f21feb1b43f6bc413eb7a08d..199dbf669fe5a75797569a74c28152fc39038428 100644 --- a/domain/model/group_m/room.go +++ b/domain/model/group_m/room.go @@ -4,7 +4,6 @@ import ( "git.hilo.cn/hilo-common/domain" "git.hilo.cn/hilo-common/mylogrus" "git.hilo.cn/hilo-common/resource/mysql" - "git.hilo.cn/hilo-common/resource/redisCli" "hilo-user/_const/redis_key/group_k" "hilo-user/myerr" "strconv" @@ -26,7 +25,7 @@ func RoomLivingUserIdFilter(model *domain.Model, userIds []mysql.ID) (map[mysql. return nil, myerr.WrapErr(err) } - groupUserIdstrs, err := redisCli.GetRedis().ZRange(model, key, 0, -1).Result() + groupUserIdstrs, err := model.RedisCluster.ZRange(model, key, 0, -1).Result() if err != nil { return nil, myerr.WrapErr(err) } @@ -34,7 +33,6 @@ func RoomLivingUserIdFilter(model *domain.Model, userIds []mysql.ID) (map[mysql. resultUserSet := map[mysql.ID]string{} for i, _ := range groupUserIdstrs { tempGroupUid, userId := analysisMemberStr(groupUserIdstrs[i]) - mylogrus.MyLog.Debugf("RoomLivingUserIdFilter, analysisMemberStr %s, %d", tempGroupUid, userId) if _, flag := userIdSet[userId]; flag { resultUserSet[userId] = tempGroupUid @@ -44,7 +42,7 @@ func RoomLivingUserIdFilter(model *domain.Model, userIds []mysql.ID) (map[mysql. } func ClearExpired(model *domain.Model, key string, expireSec int64) error { - return model.Redis.ZRemRangeByScore(model, key, + return model.RedisCluster.ZRemRangeByScore(model, key, "0", strconv.FormatInt(time.Now().Unix()-expireSec, 10)).Err() }