diff --git a/modules/timer/huntingrank.go b/modules/timer/huntingrank.go index 3b1c8e168..4badf1fde 100644 --- a/modules/timer/huntingrank.go +++ b/modules/timer/huntingrank.go @@ -38,9 +38,9 @@ func (this *HuntingRank) Start() (err error) { func (this *HuntingRank) Timer() { data := make([]interface{}, 0) // options.Find().SetLimit(comm.MaxRankList) for i := 1; i <= 4; i++ { // boss 类型 1 2 3 4 后面封装 // 时间参数战斗调完后再加进来 - if _data, err := this.DB.Find(comm.TableHuntingRank, bson.M{"bosstype": i}, options.Find().SetSort(bson.M{"difficulty": -1}).SetLimit(comm.MaxRankList)); err == nil { + if _data, err := this.DB.Find(core.SqlTable(this.TableName), bson.M{"bosstype": i}, options.Find().SetSort(bson.M{"difficulty": -1}).SetLimit(comm.MaxRankList)); err == nil { for _data.Next(context.TODO()) { - temp := &pb.DBPagodaRank{} + temp := &pb.DBHuntingRank{} if err = _data.Decode(temp); err == nil { data = append(data, temp) } @@ -49,9 +49,9 @@ func (this *HuntingRank) Timer() { } if len(data) > 0 { - err := this.Redis.RPush(comm.TablePagodaRank, data...) + err := this.Redis.RPush(this.TableName, data...) if err == nil { - err = this.Redis.Ltrim(comm.TablePagodaRank, -1*len(data), -1) //对一个列表进行修剪 + err = this.Redis.Ltrim(this.TableName, -1*len(data), -1) //对一个列表进行修剪 if err != nil { log.Errorf("delete failed") } diff --git a/modules/timer/vikingrank.go b/modules/timer/vikingrank.go index 94ccf9b40..0e7f6f825 100644 --- a/modules/timer/vikingrank.go +++ b/modules/timer/vikingrank.go @@ -38,9 +38,9 @@ func (this *VikingRank) Start() (err error) { func (this *VikingRank) Timer() { data := make([]interface{}, 0) // options.Find().SetLimit(comm.MaxRankList) for i := 1; i <= 3; i++ { // boss 类型 1 2 3 后面封装 // 时间参数战斗调完后再加进来 - if _data, err := this.DB.Find(comm.TableVikingRank, bson.M{"bosstype": i}, options.Find().SetSort(bson.M{"difficulty": -1}).SetLimit(comm.MaxRankList)); err == nil { + if _data, err := this.DB.Find(core.SqlTable(this.TableName), bson.M{"bosstype": i}, options.Find().SetSort(bson.M{"difficulty": -1}).SetLimit(comm.MaxRankList)); err == nil { for _data.Next(context.TODO()) { - temp := &pb.DBPagodaRank{} + temp := &pb.DBVikingRank{} if err = _data.Decode(temp); err == nil { data = append(data, temp) } @@ -49,9 +49,9 @@ func (this *VikingRank) Timer() { } if len(data) > 0 { - err := this.Redis.RPush(comm.TablePagodaRank, data...) + err := this.Redis.RPush(this.TableName, data...) if err == nil { - err = this.Redis.Ltrim(comm.TablePagodaRank, -1*len(data), -1) //对一个列表进行修剪 + err = this.Redis.Ltrim(this.TableName, -1*len(data), -1) //对一个列表进行修剪 if err != nil { log.Errorf("delete failed") }