From d9bcf821fdf5d09c14cfe5dd14a26e4fc37406e1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 16 Jul 2024 17:52:54 +0800 Subject: [PATCH] 1 --- server/marketserver/api/v1/ingame/ingame.go | 22 +++++++++++++++++++++ third_party/f5 | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/server/marketserver/api/v1/ingame/ingame.go b/server/marketserver/api/v1/ingame/ingame.go index fc815a09..6956e912 100644 --- a/server/marketserver/api/v1/ingame/ingame.go +++ b/server/marketserver/api/v1/ingame/ingame.go @@ -1,7 +1,9 @@ package ingame import ( + "q5" "f5" + . "main/global" "github.com/gin-gonic/gin" ) @@ -31,6 +33,26 @@ func (this *InGameApi) HeroList(c *gin.Context) { f5.RspErr(c, 401, "params parse error") return } + err, heroList := GetCacheMgr().GetIngameHero("") + if err != nil { + f5.RspErr(c, 500, "server internal error") + return + } + f5.DataSetStreamPageQuery( + heroList, + q5.SafeToInt32(reqJson.PageSize), + q5.SafeToInt64(reqJson.Cursor), + func (row interface{}) bool { + return true + }, + func (a interface{}, b interface{}) bool { + return true + }, + func (p *f5.StreamPagination) { + }, + func (row interface{}) { + + }) } func (this *InGameApi) HeroMint(c *gin.Context) { diff --git a/third_party/f5 b/third_party/f5 index 5610bc1f..a55bc814 160000 --- a/third_party/f5 +++ b/third_party/f5 @@ -1 +1 @@ -Subproject commit 5610bc1f758e6b7b7738e4ac4ee492206b26b3e3 +Subproject commit a55bc814287f711be731be3a27badd50fd6bfb35