Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

modules/pagoda/api_getlist.go

@@ -3,7 +3,6 @@ package pagoda
 import (
 	"go_dreamfactory/comm"
 	"go_dreamfactory/pb"
-	"log"
 
 	"go.mongodb.org/mongo-driver/bson/primitive"
 	"google.golang.org/protobuf/proto"
@@ -45,7 +44,6 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq
 		list.PagodaId = season.PagodaId
 		list.Type = season.Type
 	}
-	ranklist, _ := this.module.modulerank.GetRankData()
+
-	log.Fatalf("%v", ranklist)
 	return
 }

modules/pagoda/api_ranklist.go

@@ -17,9 +17,9 @@ func (this *apiComp) RankList(session comm.IUserSession, req *pb.PagodaRankListR
 
 	code = this.RankListCheck(session, req)
 	if code != pb.ErrorCode_Success {
-		return // 参数校验失败直接返回
+		return
 	}
-	// 临时测试用
+
 	szRank, err := this.module.modulerank.GetRankData()
 	if err != nil {
 		code = pb.ErrorCode_DBError

modules/pagoda/model_rank.go

@@ -55,9 +55,9 @@ func (this *ModelRank) ChangeUserRank(uid string, value map[string]interface{})
 	return this.Change(uid, value)
 }
 
-// 临时测试
 func (this *ModelRank) GetRankData() (data []*pb.DBPagodaRank, err error) {
-	err = this.Redis.Get(comm.TablePagodaRank, data)
+	data = make([]*pb.DBPagodaRank, 0)
+	err = this.Redis.LRange(comm.TablePagodaRank, 0, -1, &data)
 
 	return
 }

modules/timer/pagodarank.go

@@ -30,7 +30,7 @@ func (this *PagodaRank) Init(service core.IService, module core.IModule, comp co
 
 func (this *PagodaRank) Start() (err error) {
 	err = this.MCompModel.Start()
-	cron.AddFunc("*/5 * * * * ?", this.Timer) //每五秒执行一次
+	cron.AddFunc("*/60 * * * * ?", this.Timer) //每60s执行一次
 	return
 }