From 8412b41afa32eeebe9083877c26d4bac8d71027c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Wed, 20 Nov 2024 14:42:56 +0800 Subject: [PATCH] 1 --- server/wheelserver/api/v1/gm/gm.go | 4 ++-- server/wheelserver/service/gm.go | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/server/wheelserver/api/v1/gm/gm.go b/server/wheelserver/api/v1/gm/gm.go index d68fdaa3..542df90f 100644 --- a/server/wheelserver/api/v1/gm/gm.go +++ b/server/wheelserver/api/v1/gm/gm.go @@ -37,9 +37,9 @@ func (this *GmApi) ExecCmd(c *gin.Context) { vo.BaseVo }{} if len(cmds) > 1 { - service.GM.DispatchCmd(cmds[0], cmds[1:len(cmds)], &rspObj.BaseVo) + service.GM.DispatchCmd(s, cmds[0], cmds[1:len(cmds)], &rspObj.BaseVo) } else { - service.GM.DispatchCmd(cmds[0], []string{}, &rspObj.BaseVo) + service.GM.DispatchCmd(s, cmds[0], []string{}, &rspObj.BaseVo) } c.JSON(200, rspObj) } diff --git a/server/wheelserver/service/gm.go b/server/wheelserver/service/gm.go index 83c9dc79..b70deecb 100644 --- a/server/wheelserver/service/gm.go +++ b/server/wheelserver/service/gm.go @@ -3,10 +3,11 @@ package service import ( "q5" "main/vo" + "main/common" ) type gm struct { - cmdHash q5.ConcurrentMap[string, func(string, []string, *vo.BaseVo)] + cmdHash q5.ConcurrentMap[string, func(common.Session, string, []string, *vo.BaseVo)] } func (this *gm) init() { @@ -16,11 +17,11 @@ func (this *gm) init() { func (this *gm) unInit() { } -func (this *gm) DispatchCmd(cmd string, params []string, baseVo *vo.BaseVo) { +func (this *gm) DispatchCmd(s common.Session, cmd string, params []string, baseVo *vo.BaseVo) { if cb, ok := this.cmdHash.Load(cmd); ok { - (*cb)(cmd, params, baseVo) + (*cb)(s, cmd, params, baseVo) } } -func (this *gm) addItem(cmd string, params []string, baseVo *vo.BaseVo) { +func (this *gm) addItem(s common.Session, cmd string, params []string, baseVo *vo.BaseVo) { }