From d8784ca3f537e4aa374918b4defbbdbb5711ec63 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 20 Nov 2024 16:25:37 +0800
Subject: [PATCH] 1

---
 server/wheelserver/router/bag/bag.go   | 2 +-
 server/wheelserver/router/gm/enter.go  | 2 +-
 server/wheelserver/router/gm/gm.go     | 6 +++---
 server/wheelserver/router/routermgr.go | 9 +++++++++
 server/wheelserver/vo/user.go          | 2 +-
 5 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/server/wheelserver/router/bag/bag.go b/server/wheelserver/router/bag/bag.go
index 1ab9694c..a2a558df 100644
--- a/server/wheelserver/router/bag/bag.go
+++ b/server/wheelserver/router/bag/bag.go
@@ -15,5 +15,5 @@ func (this *BagRouter) InitRouter() {
 		api.BagApi.List)
 	f5.GetApp().GetGinEngine().POST("/api/v1/bag/use_item",
 		middleware.JwtAuth,
-		api.BagApi.UserItem)
+		api.BagApi.UseItem)
 }
diff --git a/server/wheelserver/router/gm/enter.go b/server/wheelserver/router/gm/enter.go
index 8805bd16..a22e14cc 100644
--- a/server/wheelserver/router/gm/enter.go
+++ b/server/wheelserver/router/gm/enter.go
@@ -1,5 +1,5 @@
 package gm
 
 type RouterGroup struct {
-	GmRouter
+	GMRouter
 }
diff --git a/server/wheelserver/router/gm/gm.go b/server/wheelserver/router/gm/gm.go
index b557349d..6cec73e1 100644
--- a/server/wheelserver/router/gm/gm.go
+++ b/server/wheelserver/router/gm/gm.go
@@ -1,4 +1,4 @@
-package user
+package gm
 
 import (
 	"f5"
@@ -9,8 +9,8 @@ import (
 type GMRouter struct{}
 
 func (this *GMRouter) InitRouter() {
-	api := v1.ApiGroupApp.BagApiGroup
+	api := v1.ApiGroupApp.GmApiGroup
 	f5.GetApp().GetGinEngine().POST("/api/v1/gm/exec_cmd",
 		middleware.JwtAuth,
-		api.BagApi.ExecCmd)
+		api.GmApi.ExecCmd)
 }
diff --git a/server/wheelserver/router/routermgr.go b/server/wheelserver/router/routermgr.go
index d86ae510..20eacdc6 100644
--- a/server/wheelserver/router/routermgr.go
+++ b/server/wheelserver/router/routermgr.go
@@ -10,6 +10,9 @@ import (
 	"main/router/mission"
 	"main/router/shop"
 	"main/router/user"
+	"main/router/bag"
+	"main/router/buff"
+	"main/router/gm"
 )
 
 type routerMgr struct {
@@ -20,6 +23,9 @@ type routerMgr struct {
 	mission mission.RouterGroup
 	shop shop.RouterGroup
 	user user.RouterGroup
+	bag bag.RouterGroup
+	buff buff.RouterGroup
+	gm gm.RouterGroup
 }
 
 func (this *routerMgr) Init() {
@@ -31,6 +37,9 @@ func (this *routerMgr) Init() {
 	this.mission.MissionRouter.InitRouter()
 	this.shop.ShopRouter.InitRouter()
 	this.user.UserRouter.InitRouter()
+	this.bag.BagRouter.InitRouter()
+	this.buff.BuffRouter.InitRouter()
+	this.gm.GMRouter.InitRouter()
 
 	f5.GetSysLog().Info("routerMgr.init")
 
diff --git a/server/wheelserver/vo/user.go b/server/wheelserver/vo/user.go
index 879f890d..509c324d 100644
--- a/server/wheelserver/vo/user.go
+++ b/server/wheelserver/vo/user.go
@@ -23,5 +23,5 @@ func (this *User) FromModel(m *model.User) {
 	this.HourlyEarnings = "0"
 	this.Dice = m.Dice
 	this.SpecDice = m.SpecDice
-	this.CurrGrid = 0
+	this.CurrGrid = m.CurrGrid
 }