diff --git a/src/server/benchmark_test.go b/src/server/benchmark_test.go
index dfc02b0f..f1c7dc52 100644
--- a/src/server/benchmark_test.go
+++ b/src/server/benchmark_test.go
@@ -4,9 +4,7 @@ import (
 	"fmt"
 	"runtime"
 	"server/game"
-	"server/game/mod/msg"
 	"testing"
-	"time"
 )
 
 //	func TestBenchInit(t *testing.T) {
@@ -20,36 +18,6 @@ import (
 //			}
 //		}
 //	}
-func BenchmarkGame(b *testing.B) {
-	runtime.GOMAXPROCS(2)
-	fmt.Print("BenchmarkGame")
-	f := "wmz00%d"
-	for i := 0; i < 10000; i++ {
-		go func() {
-			UserName := fmt.Sprintf(f, i)
-			p1 := new(game.Player)
-			err := p1.InitPlayer(UserName)
-			if err != nil {
-				fmt.Println(err)
-			}
-			game.G_GameLogicPtr.SetPlayer(p1)
-			for {
-				time.Sleep(1 * time.Second)
-				game.Benchmark(p1)
-			}
-		}()
-	}
-	go func() {
-		time.Sleep(20 * time.Second)
-		game.G_GameLogicPtr.ChampshipMgrSend(&msg.Msg{
-			Type: msg.HANDLE_TYPE_CHAMPSHIP_GROUP,
-		})
-	}()
-	for {
-		time.Sleep(1 * time.Second)
-		printMemUsage()
-	}
-}
 
 func BenchmarkLog(b *testing.B) {
 	runtime.GOMAXPROCS(2)
diff --git a/src/server/cluster/Cluster.go b/src/server/cluster/Cluster.go
index 254f623a..053909e5 100644
--- a/src/server/cluster/Cluster.go
+++ b/src/server/cluster/Cluster.go
@@ -3,9 +3,9 @@ package mergeCluster
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
 	"server/conf"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"server/pkg/github.com/name5566/leaf/network"
 	"sync"
diff --git a/src/server/cluster/ClusterFunc.go b/src/server/cluster/cluster_func.go
similarity index 99%
rename from src/server/cluster/ClusterFunc.go
rename to src/server/cluster/cluster_func.go
index b610540b..f22ff9d6 100644
--- a/src/server/cluster/ClusterFunc.go
+++ b/src/server/cluster/cluster_func.go
@@ -2,9 +2,9 @@ package mergeCluster
 
 import (
 	"fmt"
-	"server/GoUtil"
 	"server/conf"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"server/pkg/github.com/name5566/leaf/network"
 	"time"
diff --git a/src/server/cluster/Type.go b/src/server/cluster/cluster_type.go
similarity index 100%
rename from src/server/cluster/Type.go
rename to src/server/cluster/cluster_type.go
diff --git a/src/server/conf/activity/ActivityCfg.go b/src/server/conf/activity/activity_cfg.go
similarity index 99%
rename from src/server/conf/activity/ActivityCfg.go
rename to src/server/conf/activity/activity_cfg.go
index e09cae97..8ab34b62 100644
--- a/src/server/conf/activity/ActivityCfg.go
+++ b/src/server/conf/activity/activity_cfg.go
@@ -1,9 +1,9 @@
 package activityCfg
 
 import (
-	"server/GoUtil"
 	languageCfg "server/conf/language"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
diff --git a/src/server/conf/avatar/AvatarCfg.go b/src/server/conf/avatar/avatar_cfg.go
similarity index 100%
rename from src/server/conf/avatar/AvatarCfg.go
rename to src/server/conf/avatar/avatar_cfg.go
diff --git a/src/server/conf/base/BaseCfg.go b/src/server/conf/base/base_cfg.go
similarity index 100%
rename from src/server/conf/base/BaseCfg.go
rename to src/server/conf/base/base_cfg.go
diff --git a/src/server/conf/card/CardCfg.go b/src/server/conf/card/card_cfg.go
similarity index 99%
rename from src/server/conf/card/CardCfg.go
rename to src/server/conf/card/card_cfg.go
index 7849b690..a3f221db 100644
--- a/src/server/conf/card/CardCfg.go
+++ b/src/server/conf/card/card_cfg.go
@@ -1,8 +1,8 @@
 package cardCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strconv"
diff --git a/src/server/conf/catnip/CatnipCfg.go b/src/server/conf/catnip/catnip_cfg.go
similarity index 99%
rename from src/server/conf/catnip/CatnipCfg.go
rename to src/server/conf/catnip/catnip_cfg.go
index bdc1742d..d60b89d3 100644
--- a/src/server/conf/catnip/CatnipCfg.go
+++ b/src/server/conf/catnip/catnip_cfg.go
@@ -1,8 +1,8 @@
 package catnipCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 
diff --git a/src/server/conf/champship/ChampshipCfg.go b/src/server/conf/champship/champship_cfg.go
similarity index 98%
rename from src/server/conf/champship/ChampshipCfg.go
rename to src/server/conf/champship/champship_cfg.go
index 82851c52..47211d3f 100644
--- a/src/server/conf/champship/ChampshipCfg.go
+++ b/src/server/conf/champship/champship_cfg.go
@@ -1,8 +1,8 @@
 package champshipCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 
diff --git a/src/server/conf/charge/ChargeCfg.go b/src/server/conf/charge/charge_cfg.go
similarity index 99%
rename from src/server/conf/charge/ChargeCfg.go
rename to src/server/conf/charge/charge_cfg.go
index b9153c61..a86d48c3 100644
--- a/src/server/conf/charge/ChargeCfg.go
+++ b/src/server/conf/charge/charge_cfg.go
@@ -1,8 +1,8 @@
 package chargeCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"sort"
 	"strings"
diff --git a/src/server/conf/collect/CollectCfg.go b/src/server/conf/collect/collect_cfg.go
similarity index 97%
rename from src/server/conf/collect/CollectCfg.go
rename to src/server/conf/collect/collect_cfg.go
index 35be1bb5..22b8dc3a 100644
--- a/src/server/conf/collect/CollectCfg.go
+++ b/src/server/conf/collect/collect_cfg.go
@@ -1,8 +1,8 @@
 package collectCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 
diff --git a/src/server/conf/dailyTask/DailyTaskCfg.go b/src/server/conf/daily_task/daily_task_cfg.go
similarity index 100%
rename from src/server/conf/dailyTask/DailyTaskCfg.go
rename to src/server/conf/daily_task/daily_task_cfg.go
diff --git a/src/server/conf/decorate/DecorateCfg.go b/src/server/conf/decorate/decorate_cfg.go
similarity index 100%
rename from src/server/conf/decorate/DecorateCfg.go
rename to src/server/conf/decorate/decorate_cfg.go
diff --git a/src/server/conf/emoji/emojiCfg.go b/src/server/conf/emoji/emoji_cfg.go
similarity index 96%
rename from src/server/conf/emoji/emojiCfg.go
rename to src/server/conf/emoji/emoji_cfg.go
index 5bbc7308..f60995cf 100644
--- a/src/server/conf/emoji/emojiCfg.go
+++ b/src/server/conf/emoji/emoji_cfg.go
@@ -1,7 +1,7 @@
 package emojiCfg
 
 import (
-	"server/GoUtil"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 
diff --git a/src/server/conf/endless/EndlessCfg.go b/src/server/conf/endless/endless_cfg.go
similarity index 100%
rename from src/server/conf/endless/EndlessCfg.go
rename to src/server/conf/endless/endless_cfg.go
diff --git a/src/server/conf/face/FaceCfg.go b/src/server/conf/face/face_cfg.go
similarity index 100%
rename from src/server/conf/face/FaceCfg.go
rename to src/server/conf/face/face_cfg.go
diff --git a/src/server/conf/friend/friendCfg.go b/src/server/conf/friend/friend_cfg.go
similarity index 100%
rename from src/server/conf/friend/friendCfg.go
rename to src/server/conf/friend/friend_cfg.go
diff --git a/src/server/conf/friendTreasure/friendTreasureCfg.go b/src/server/conf/friend_treasure/friend_treasure_cfg.go
similarity index 98%
rename from src/server/conf/friendTreasure/friendTreasureCfg.go
rename to src/server/conf/friend_treasure/friend_treasure_cfg.go
index 15872a3e..acf1c133 100644
--- a/src/server/conf/friendTreasure/friendTreasureCfg.go
+++ b/src/server/conf/friend_treasure/friend_treasure_cfg.go
@@ -1,8 +1,8 @@
 package friendTreasureCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 
diff --git a/src/server/conf/guessColor/guessColorCfg..go b/src/server/conf/guess_color/guess_color_cfg.go
similarity index 98%
rename from src/server/conf/guessColor/guessColorCfg..go
rename to src/server/conf/guess_color/guess_color_cfg.go
index 932d979a..872622a0 100644
--- a/src/server/conf/guessColor/guessColorCfg..go
+++ b/src/server/conf/guess_color/guess_color_cfg.go
@@ -1,8 +1,8 @@
 package guesscolorCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"strings"
 )
diff --git a/src/server/conf/guide/guideCfg.go b/src/server/conf/guide/guide_cfg.go
similarity index 100%
rename from src/server/conf/guide/guideCfg.go
rename to src/server/conf/guide/guide_cfg.go
diff --git a/src/server/conf/guideTask/GuideTaskCfg.go b/src/server/conf/guide_task/guide_task_cfg.go
similarity index 98%
rename from src/server/conf/guideTask/GuideTaskCfg.go
rename to src/server/conf/guide_task/guide_task_cfg.go
index 19a4255a..c0158042 100644
--- a/src/server/conf/guideTask/GuideTaskCfg.go
+++ b/src/server/conf/guide_task/guide_task_cfg.go
@@ -1,8 +1,8 @@
 package GuideTaskCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strconv"
diff --git a/src/server/conf/guideTask/GuideTaskCfg_test.go b/src/server/conf/guide_task/guide_task_cfg_test.go
similarity index 100%
rename from src/server/conf/guideTask/GuideTaskCfg_test.go
rename to src/server/conf/guide_task/guide_task_cfg_test.go
diff --git a/src/server/conf/handbook/handbookCfg.go b/src/server/conf/handbook/handbook_cfg.go
similarity index 100%
rename from src/server/conf/handbook/handbookCfg.go
rename to src/server/conf/handbook/handbook_cfg.go
diff --git a/src/server/conf/invite/inviteCfg.go b/src/server/conf/invite/invite_cfg.go
similarity index 100%
rename from src/server/conf/invite/inviteCfg.go
rename to src/server/conf/invite/invite_cfg.go
diff --git a/src/server/conf/item/ItemCfg.go b/src/server/conf/item/Item_cfg.go
similarity index 100%
rename from src/server/conf/item/ItemCfg.go
rename to src/server/conf/item/Item_cfg.go
diff --git a/src/server/conf/language/languageCfg.go b/src/server/conf/language/language_cfg.go
similarity index 100%
rename from src/server/conf/language/languageCfg.go
rename to src/server/conf/language/language_cfg.go
diff --git a/src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go b/src/server/conf/limited_time_event/limited_time_event_cfg.go
similarity index 99%
rename from src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go
rename to src/server/conf/limited_time_event/limited_time_event_cfg.go
index 6c4e30b7..99efcf8b 100644
--- a/src/server/conf/limitedTimeEvent/LimitedTimeEventCfg.go
+++ b/src/server/conf/limited_time_event/limited_time_event_cfg.go
@@ -1,8 +1,8 @@
 package limitedTimeEventCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"
diff --git a/src/server/conf/mail/mailCfg.go b/src/server/conf/mail/mail_cfg.go
similarity index 99%
rename from src/server/conf/mail/mailCfg.go
rename to src/server/conf/mail/mail_cfg.go
index 73a11f6c..c237068a 100644
--- a/src/server/conf/mail/mailCfg.go
+++ b/src/server/conf/mail/mail_cfg.go
@@ -2,9 +2,9 @@ package mailCfg
 
 import (
 	"fmt"
-	"server/GoUtil"
 	languageCfg "server/conf/language"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/msg"
 	"strings"
diff --git a/src/server/conf/mergeData/MergeDataCfg.go b/src/server/conf/merge_data/merge_data_cfg.go
similarity index 99%
rename from src/server/conf/mergeData/MergeDataCfg.go
rename to src/server/conf/merge_data/merge_data_cfg.go
index ae3c8220..fa7c00fe 100644
--- a/src/server/conf/mergeData/MergeDataCfg.go
+++ b/src/server/conf/merge_data/merge_data_cfg.go
@@ -2,8 +2,8 @@ package mergeDataCfg
 
 import (
 	"errors"
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strconv"
diff --git a/src/server/conf/mining/miningCfg.go b/src/server/conf/mining/mining_cfg.go
similarity index 98%
rename from src/server/conf/mining/miningCfg.go
rename to src/server/conf/mining/mining_cfg.go
index efb72bfd..c1a90bba 100644
--- a/src/server/conf/mining/miningCfg.go
+++ b/src/server/conf/mining/mining_cfg.go
@@ -1,8 +1,8 @@
 package miningCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"strconv"
 	"strings"
diff --git a/src/server/conf/order/orderCfg.go b/src/server/conf/order/order_cfg.go
similarity index 100%
rename from src/server/conf/order/orderCfg.go
rename to src/server/conf/order/order_cfg.go
diff --git a/src/server/conf/pass/passCfg.go b/src/server/conf/pass/pass_cfg.go
similarity index 100%
rename from src/server/conf/pass/passCfg.go
rename to src/server/conf/pass/pass_cfg.go
diff --git a/src/server/conf/playroom/playroomCfg.go b/src/server/conf/playroom/playroom_cfg.go
similarity index 99%
rename from src/server/conf/playroom/playroomCfg.go
rename to src/server/conf/playroom/playroom_cfg.go
index 61faae1d..89d30a00 100644
--- a/src/server/conf/playroom/playroomCfg.go
+++ b/src/server/conf/playroom/playroom_cfg.go
@@ -1,8 +1,8 @@
 package playroomCfg
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strings"
diff --git a/src/server/conf/race/raceCfg.go b/src/server/conf/race/race_cfg.go
similarity index 100%
rename from src/server/conf/race/raceCfg.go
rename to src/server/conf/race/race_cfg.go
diff --git a/src/server/conf/randname/randnameCfg.go b/src/server/conf/randname/randname_cfg.go
similarity index 97%
rename from src/server/conf/randname/randnameCfg.go
rename to src/server/conf/randname/randname_cfg.go
index 0a8a04ec..b0f4cdcf 100644
--- a/src/server/conf/randname/randnameCfg.go
+++ b/src/server/conf/randname/randname_cfg.go
@@ -1,7 +1,7 @@
 package randnameCfg
 
 import (
-	"server/GoUtil"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"strconv"
 )
diff --git a/src/server/conf/sevenLogin/SevenLoginCfg.go b/src/server/conf/seven_login/seven_login_cfg.go
similarity index 100%
rename from src/server/conf/sevenLogin/SevenLoginCfg.go
rename to src/server/conf/seven_login/seven_login_cfg.go
diff --git a/src/server/conf/startMerge/StartMergeCfg.go b/src/server/conf/start_merge/start_merge_cfg.go
similarity index 100%
rename from src/server/conf/startMerge/StartMergeCfg.go
rename to src/server/conf/start_merge/start_merge_cfg.go
diff --git a/src/server/conf/user/UserData.go b/src/server/conf/user/user_cfg.go
similarity index 100%
rename from src/server/conf/user/UserData.go
rename to src/server/conf/user/user_cfg.go
diff --git a/src/server/db/Mysql.go b/src/server/db/Mysql.go
index 43f835ca..9cb4b880 100644
--- a/src/server/db/Mysql.go
+++ b/src/server/db/Mysql.go
@@ -3,9 +3,9 @@ package db
 import (
 	"fmt"
 	"reflect"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strings"
 	"sync"
diff --git a/src/server/game/GameLogic.go b/src/server/game/GameLogic.go
index 6c6be5b5..a46b8b02 100644
--- a/src/server/game/GameLogic.go
+++ b/src/server/game/GameLogic.go
@@ -6,10 +6,10 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
 	userCfg "server/conf/user"
+	GoUtil "server/game_util"
 	"strconv"
 	"sync"
 
diff --git a/src/server/game/ActivityFunc.go b/src/server/game/activity_func.go
similarity index 99%
rename from src/server/game/ActivityFunc.go
rename to src/server/game/activity_func.go
index 48a10824..a840a5cc 100644
--- a/src/server/game/ActivityFunc.go
+++ b/src/server/game/activity_func.go
@@ -2,10 +2,9 @@ package game
 
 import (
 	"fmt"
-	"server/GoUtil"
 	activityCfg "server/conf/activity"
 	catnipCfg "server/conf/catnip"
-	guesscolorCfg "server/conf/guessColor"
+	guesscolorCfg "server/conf/guess_color"
 	itemCfg "server/conf/item"
 	languageCfg "server/conf/language"
 	mailCfg "server/conf/mail"
@@ -15,6 +14,7 @@ import (
 	"server/game/mod/activity"
 	"server/game/mod/item"
 	"server/game/mod/mail"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/admin.go b/src/server/game/admin.go
index ba4a62e1..45361af8 100644
--- a/src/server/game/admin.go
+++ b/src/server/game/admin.go
@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"fmt"
 	"runtime"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
 	"server/db"
 	Msg "server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/gate"
diff --git a/src/server/game/BanMgr.go b/src/server/game/ban_mgr.go
similarity index 98%
rename from src/server/game/BanMgr.go
rename to src/server/game/ban_mgr.go
index f9ab1588..0bc22fb0 100644
--- a/src/server/game/BanMgr.go
+++ b/src/server/game/ban_mgr.go
@@ -2,7 +2,7 @@ package game
 
 import (
 	"encoding/gob"
-	"server/GoUtil"
+	GoUtil "server/game_util"
 )
 
 type BanMgr struct {
diff --git a/src/server/game/ChampshipMgr.go b/src/server/game/champship_mgr.go
similarity index 99%
rename from src/server/game/ChampshipMgr.go
rename to src/server/game/champship_mgr.go
index 8b5d029f..2eec44f1 100644
--- a/src/server/game/ChampshipMgr.go
+++ b/src/server/game/champship_mgr.go
@@ -2,10 +2,10 @@ package game
 
 import (
 	"math"
-	"server/GoUtil"
 	champshipCfg "server/conf/champship"
 	randnameCfg "server/conf/randname"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	proto "server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"
diff --git a/src/server/game/ChargeFunc.go b/src/server/game/charge_func.go
similarity index 99%
rename from src/server/game/ChargeFunc.go
rename to src/server/game/charge_func.go
index b6223dc9..836a3214 100644
--- a/src/server/game/ChargeFunc.go
+++ b/src/server/game/charge_func.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"os/exec"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
 	activityCfg "server/conf/activity"
@@ -14,8 +13,9 @@ import (
 	"server/game/mod/activity"
 	"server/game/mod/item"
 	MsgMod "server/game/mod/msg"
-	"server/game/mod/piggyBank"
+	piggyBank "server/game/mod/piggy_bank"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	proto "server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strings"
diff --git a/src/server/game/ClusterMgr.go b/src/server/game/cluster_mgr.go
similarity index 100%
rename from src/server/game/ClusterMgr.go
rename to src/server/game/cluster_mgr.go
diff --git a/src/server/game/CompensationFunc.go b/src/server/game/compensation_func.go
similarity index 100%
rename from src/server/game/CompensationFunc.go
rename to src/server/game/compensation_func.go
diff --git a/src/server/game/external.go b/src/server/game/external.go
index 4cb6f5fa..8cf8505a 100644
--- a/src/server/game/external.go
+++ b/src/server/game/external.go
@@ -3,10 +3,10 @@ package game
 import (
 	"fmt"
 	"reflect"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
 	"server/game/internal"
+	GoUtil "server/game_util"
 	"strings"
 	"time"
 
diff --git a/src/server/game/FriendFunc.go b/src/server/game/friend_func.go
similarity index 99%
rename from src/server/game/FriendFunc.go
rename to src/server/game/friend_func.go
index dcc1fe67..5f7afd4a 100644
--- a/src/server/game/FriendFunc.go
+++ b/src/server/game/friend_func.go
@@ -1,9 +1,9 @@
 package game
 
 import (
-	"server/GoUtil"
 	"server/db"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"
 )
diff --git a/src/server/game/FriendMgr.go b/src/server/game/friend_mgr.go
similarity index 99%
rename from src/server/game/FriendMgr.go
rename to src/server/game/friend_mgr.go
index cde0258d..787a598a 100644
--- a/src/server/game/FriendMgr.go
+++ b/src/server/game/friend_mgr.go
@@ -3,7 +3,6 @@ package game
 import (
 	"encoding/gob"
 	"fmt"
-	"server/GoUtil"
 	"server/MergeConst"
 	mergeCluster "server/cluster"
 	"server/conf"
@@ -11,6 +10,7 @@ import (
 	"server/game/mod/friend"
 	"server/game/mod/item"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 )
 
diff --git a/src/server/game/Type.go b/src/server/game/game_type.go
similarity index 97%
rename from src/server/game/Type.go
rename to src/server/game/game_type.go
index 55d416d4..f9ac9e07 100644
--- a/src/server/game/Type.go
+++ b/src/server/game/game_type.go
@@ -3,7 +3,7 @@ package game
 import (
 	"encoding/gob"
 	"server/game/mod/friend"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	"server/game/mod/msg"
 )
 
diff --git a/src/server/game/Gm.go b/src/server/game/gm_handler.go
similarity index 99%
rename from src/server/game/Gm.go
rename to src/server/game/gm_handler.go
index a5a85253..d6e9c58d 100644
--- a/src/server/game/Gm.go
+++ b/src/server/game/gm_handler.go
@@ -5,14 +5,13 @@ import (
 	"encoding/gob"
 	"fmt"
 	"os"
-	"server/GoUtil"
 	"server/conf"
 	avatarCfg "server/conf/avatar"
 	cardCfg "server/conf/card"
 	chargeCfg "server/conf/charge"
 	emojiCfg "server/conf/emoji"
 	faceCfg "server/conf/face"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	playroomCfg "server/conf/playroom"
 	"server/db"
 	"server/game/mod/activity"
@@ -27,6 +26,7 @@ import (
 	MsgMod "server/game/mod/msg"
 	"server/game/mod/order"
 	"server/game/mod/playroom"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strconv"
diff --git a/src/server/game/internal/chanrpc.go b/src/server/game/internal/chanrpc.go
index 997cb731..9f4f7e1f 100644
--- a/src/server/game/internal/chanrpc.go
+++ b/src/server/game/internal/chanrpc.go
@@ -1,8 +1,8 @@
 package internal
 
 import (
-	"server/GoUtil"
 	"server/MergeConst"
+	GoUtil "server/game_util"
 	"sync"
 
 	"server/pkg/github.com/name5566/leaf/gate"
diff --git a/src/server/game/internal/module.go b/src/server/game/internal/module.go
index c779ecf1..d5074b39 100644
--- a/src/server/game/internal/module.go
+++ b/src/server/game/internal/module.go
@@ -1,8 +1,8 @@
 package internal
 
 import (
-	"server/GoUtil"
 	"server/base"
+	GoUtil "server/game_util"
 
 	"server/pkg/github.com/name5566/leaf/module"
 )
diff --git a/src/server/game/LimitedTimeTrigger.go b/src/server/game/limited_time_trigger.go
similarity index 99%
rename from src/server/game/LimitedTimeTrigger.go
rename to src/server/game/limited_time_trigger.go
index 6dd6cf8d..0a6c44e7 100644
--- a/src/server/game/LimitedTimeTrigger.go
+++ b/src/server/game/limited_time_trigger.go
@@ -3,14 +3,14 @@ package game
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
 	playroomCfg "server/conf/playroom"
 	userCfg "server/conf/user"
 	"server/game/mod/card"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	MsgMod "server/game/mod/msg" // Ensure this package exists and is correctly referenced
 	"server/game/mod/playroom"
+	GoUtil "server/game_util"
 	"server/msg"
 	"time"
 )
diff --git a/src/server/game/LogMgr.go b/src/server/game/log_mgr.go
similarity index 100%
rename from src/server/game/LogMgr.go
rename to src/server/game/log_mgr.go
diff --git a/src/server/game/MailMgr.go b/src/server/game/mail_mgr.go
similarity index 98%
rename from src/server/game/MailMgr.go
rename to src/server/game/mail_mgr.go
index b8b0ac84..9351876d 100644
--- a/src/server/game/MailMgr.go
+++ b/src/server/game/mail_mgr.go
@@ -2,10 +2,10 @@ package game
 
 import (
 	"encoding/json"
-	"server/GoUtil"
 	"server/db"
 	"server/game/mod/item"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"strings"
 )
diff --git a/src/server/game/MessageHandler.go b/src/server/game/message_handler.go
similarity index 99%
rename from src/server/game/MessageHandler.go
rename to src/server/game/message_handler.go
index 546bac7a..74272463 100644
--- a/src/server/game/MessageHandler.go
+++ b/src/server/game/message_handler.go
@@ -2,15 +2,14 @@ package game
 
 import (
 	"fmt"
-	"server/GoUtil"
 	mergeCluster "server/cluster"
 	cardCfg "server/conf/card"
 	catnipCfg "server/conf/catnip"
 	decorateCfg "server/conf/decorate"
 	itemCfg "server/conf/item"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
+	limitedTimeEventCfg "server/conf/limited_time_event"
 	mailCfg "server/conf/mail"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	orderCfg "server/conf/order"
 	playroomCfg "server/conf/playroom"
 	userCfg "server/conf/user"
@@ -18,11 +17,12 @@ import (
 	"server/game/mod/card"
 	"server/game/mod/friend"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	"server/game/mod/mail"
 	"server/game/mod/msg"
 	"server/game/mod/order"
 	"server/game/mod/playroom"
+	GoUtil "server/game_util"
 	proto "server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"
diff --git a/src/server/game/mod/activity/activity.go b/src/server/game/mod/activity/activity.go
index 131a8298..87e0dac0 100644
--- a/src/server/game/mod/activity/activity.go
+++ b/src/server/game/mod/activity/activity.go
@@ -3,9 +3,9 @@ package activity
 import (
 	"encoding/gob"
 	"fmt"
-	"server/GoUtil"
 	activityCfg "server/conf/activity"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 )
 
diff --git a/src/server/game/mod/activity/activityGift.go b/src/server/game/mod/activity/activity_gift.go
similarity index 93%
rename from src/server/game/mod/activity/activityGift.go
rename to src/server/game/mod/activity/activity_gift.go
index a7874c21..3d0c174b 100644
--- a/src/server/game/mod/activity/activityGift.go
+++ b/src/server/game/mod/activity/activity_gift.go
@@ -2,9 +2,9 @@ package activity
 
 import (
 	"fmt"
-	"server/GoUtil"
 	activityCfg "server/conf/activity"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 func (a *Activity) Fire(Id int) ([]*item.Item, error) {
diff --git a/src/server/game/mod/avatar/Avatar.go b/src/server/game/mod/avatar/Avatar.go
index 9cc72430..34b73c3b 100644
--- a/src/server/game/mod/avatar/Avatar.go
+++ b/src/server/game/mod/avatar/Avatar.go
@@ -2,8 +2,8 @@ package avatar
 
 import (
 	"fmt"
-	"server/GoUtil"
 	avatarCfg "server/conf/avatar"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/base/Base.go b/src/server/game/mod/base/Base.go
index 9c155784..5bd68e39 100644
--- a/src/server/game/mod/base/Base.go
+++ b/src/server/game/mod/base/Base.go
@@ -2,10 +2,10 @@ package base
 
 import (
 	"fmt"
-	"server/GoUtil"
 	"server/conf"
 	baseCfg "server/conf/base"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/card/Card.go b/src/server/game/mod/card/Card.go
index a83d3ff8..8b9ce43f 100644
--- a/src/server/game/mod/card/Card.go
+++ b/src/server/game/mod/card/Card.go
@@ -2,9 +2,9 @@ package card
 
 import (
 	"fmt"
-	"server/GoUtil"
 	cardCfg "server/conf/card"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 )
diff --git a/src/server/game/mod/card/CardFunc.go b/src/server/game/mod/card/card_func.go
similarity index 93%
rename from src/server/game/mod/card/CardFunc.go
rename to src/server/game/mod/card/card_func.go
index 26bf2b50..3cca87f6 100644
--- a/src/server/game/mod/card/CardFunc.go
+++ b/src/server/game/mod/card/card_func.go
@@ -1,8 +1,8 @@
 package card
 
 import (
-	"server/GoUtil"
 	cardCfg "server/conf/card"
+	GoUtil "server/game_util"
 )
 
 func randCard(Round, Star, IsGold int, Except []int) int {
diff --git a/src/server/game/mod/catnip/Catnip.go b/src/server/game/mod/catnip/Catnip.go
index eeffce73..347e6dfd 100644
--- a/src/server/game/mod/catnip/Catnip.go
+++ b/src/server/game/mod/catnip/Catnip.go
@@ -2,9 +2,9 @@ package catnip
 
 import (
 	"fmt"
-	"server/GoUtil"
 	catnipCfg "server/conf/catnip"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 type CatnipMod struct {
diff --git a/src/server/game/mod/champship/Champship.go b/src/server/game/mod/champship/Champship.go
index 83f0366d..0051fd50 100644
--- a/src/server/game/mod/champship/Champship.go
+++ b/src/server/game/mod/champship/Champship.go
@@ -2,10 +2,10 @@ package champship
 
 import (
 	"fmt"
-	"server/GoUtil"
 	champshipCfg "server/conf/champship"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go
index 189aaf16..f832fe30 100644
--- a/src/server/game/mod/charge/Charge.go
+++ b/src/server/game/mod/charge/Charge.go
@@ -3,12 +3,12 @@ package charge
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
 	chargeCfg "server/conf/charge"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	playroomCfg "server/conf/playroom"
 	"server/game/mod/item"
 	"server/game/mod/order"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 )
diff --git a/src/server/game/mod/charge/ChargeFunc.go b/src/server/game/mod/charge/charge_func.go
similarity index 100%
rename from src/server/game/mod/charge/ChargeFunc.go
rename to src/server/game/mod/charge/charge_func.go
diff --git a/src/server/game/mod/chess/Chess.go b/src/server/game/mod/chess/Chess.go
index e75362da..34ef4093 100644
--- a/src/server/game/mod/chess/Chess.go
+++ b/src/server/game/mod/chess/Chess.go
@@ -3,11 +3,11 @@ package chess
 import (
 	"errors"
 	"fmt"
-	"server/GoUtil"
-	mergeDataCfg "server/conf/mergeData"
-	startMergeCfg "server/conf/startMerge"
+	mergeDataCfg "server/conf/merge_data"
+	startMergeCfg "server/conf/start_merge"
 	userCfg "server/conf/user"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 	"sort"
 	"strings"
diff --git a/src/server/game/mod/collect/Collect.go b/src/server/game/mod/collect/Collect.go
index f3fe1fbc..ccf909f4 100644
--- a/src/server/game/mod/collect/Collect.go
+++ b/src/server/game/mod/collect/Collect.go
@@ -2,9 +2,9 @@ package collect
 
 import (
 	"fmt"
-	"server/GoUtil"
 	collectCfg "server/conf/collect"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/compensation/compensation.go b/src/server/game/mod/compensation/compensation.go
index d51092ca..45f55548 100644
--- a/src/server/game/mod/compensation/compensation.go
+++ b/src/server/game/mod/compensation/compensation.go
@@ -1,8 +1,8 @@
 package compensation
 
 import (
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 type Compensation struct {
diff --git a/src/server/game/mod/dailyTask/DailyFunc.go b/src/server/game/mod/daily_task/DailyFunc.go
similarity index 93%
rename from src/server/game/mod/dailyTask/DailyFunc.go
rename to src/server/game/mod/daily_task/DailyFunc.go
index 05a76b13..aece0b39 100644
--- a/src/server/game/mod/dailyTask/DailyFunc.go
+++ b/src/server/game/mod/daily_task/DailyFunc.go
@@ -2,9 +2,9 @@ package dailyTask
 
 import (
 	"math"
-	"server/GoUtil"
-	dailyTaskCfg "server/conf/dailyTask"
+	dailyTaskCfg "server/conf/daily_task"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"sort"
 )
 
diff --git a/src/server/game/mod/dailyTask/DailyTask.go b/src/server/game/mod/daily_task/DailyTask.go
similarity index 98%
rename from src/server/game/mod/dailyTask/DailyTask.go
rename to src/server/game/mod/daily_task/DailyTask.go
index f4d99c5c..7c0eea47 100644
--- a/src/server/game/mod/dailyTask/DailyTask.go
+++ b/src/server/game/mod/daily_task/DailyTask.go
@@ -2,10 +2,10 @@ package dailyTask
 
 import (
 	"fmt"
-	"server/GoUtil"
-	dailyTaskCfg "server/conf/dailyTask"
+	dailyTaskCfg "server/conf/daily_task"
 	"server/game/mod/item"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"
diff --git a/src/server/game/mod/decorate/Decorate.go b/src/server/game/mod/decorate/Decorate.go
index ed04d977..dcbf187d 100644
--- a/src/server/game/mod/decorate/Decorate.go
+++ b/src/server/game/mod/decorate/Decorate.go
@@ -3,10 +3,10 @@ package decorate
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
 	decorateCfg "server/conf/decorate"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
+	limitedTimeEventCfg "server/conf/limited_time_event"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 	"sort"
 )
diff --git a/src/server/game/mod/emoji/emoji.go b/src/server/game/mod/emoji/emoji.go
index d8490afa..ef72caf6 100644
--- a/src/server/game/mod/emoji/emoji.go
+++ b/src/server/game/mod/emoji/emoji.go
@@ -2,8 +2,8 @@ package emoji
 
 import (
 	"fmt"
-	"server/GoUtil"
 	emojiCfg "server/conf/emoji"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/endless/EndlessFunc.go b/src/server/game/mod/endless/endless_func.go
similarity index 98%
rename from src/server/game/mod/endless/EndlessFunc.go
rename to src/server/game/mod/endless/endless_func.go
index 550f4ed5..d59212d7 100644
--- a/src/server/game/mod/endless/EndlessFunc.go
+++ b/src/server/game/mod/endless/endless_func.go
@@ -1,9 +1,9 @@
 package endless
 
 import (
-	Util "server/GoUtil"
 	endlessCfg "server/conf/endless"
 	"server/game/mod/item"
+	Util "server/game_util"
 )
 
 // 初始化奖励
diff --git a/src/server/game/mod/face/Face.go b/src/server/game/mod/face/Face.go
index 51264fec..bddd33fc 100644
--- a/src/server/game/mod/face/Face.go
+++ b/src/server/game/mod/face/Face.go
@@ -2,8 +2,8 @@ package face
 
 import (
 	"fmt"
-	"server/GoUtil"
 	faceCfg "server/conf/face"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/friend/Friend.go b/src/server/game/mod/friend/Friend.go
index 244c49a8..fe69b2a6 100644
--- a/src/server/game/mod/friend/Friend.go
+++ b/src/server/game/mod/friend/Friend.go
@@ -2,11 +2,11 @@ package friend
 
 import (
 	"fmt"
-	"server/GoUtil"
 	cardCfg "server/conf/card"
 	friendCfg "server/conf/friend"
 	"server/game/mod/card"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/friendTreasure.go/friendTreasure.go b/src/server/game/mod/friend_treasure.go/friend_treasure.go
similarity index 97%
rename from src/server/game/mod/friendTreasure.go/friendTreasure.go
rename to src/server/game/mod/friend_treasure.go/friend_treasure.go
index 20aa23cb..e5c07fbb 100644
--- a/src/server/game/mod/friendTreasure.go/friendTreasure.go
+++ b/src/server/game/mod/friend_treasure.go/friend_treasure.go
@@ -2,9 +2,9 @@ package friendTreasure
 
 import (
 	"fmt"
-	"server/GoUtil"
-	friendTreasureCfg "server/conf/friendTreasure"
+	friendTreasureCfg "server/conf/friend_treasure"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 )
diff --git a/src/server/game/mod/guessColor/guessColor.go b/src/server/game/mod/guess_color/guess_color.go
similarity index 97%
rename from src/server/game/mod/guessColor/guessColor.go
rename to src/server/game/mod/guess_color/guess_color.go
index 4c13e32d..ad6be145 100644
--- a/src/server/game/mod/guessColor/guessColor.go
+++ b/src/server/game/mod/guess_color/guess_color.go
@@ -2,10 +2,10 @@ package guesscolor
 
 import (
 	"fmt"
-	"server/GoUtil"
-	guesscolorCfg "server/conf/guessColor"
+	guesscolorCfg "server/conf/guess_color"
 	randnameCfg "server/conf/randname"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 type GuessColorMod struct {
diff --git a/src/server/game/mod/guide/Guide.go b/src/server/game/mod/guide/Guide.go
index f6b7582a..94333692 100644
--- a/src/server/game/mod/guide/Guide.go
+++ b/src/server/game/mod/guide/Guide.go
@@ -2,9 +2,9 @@ package guide
 
 import (
 	"fmt"
-	"server/GoUtil"
 	guidecfg "server/conf/guide"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/guideTask/guideTask.go b/src/server/game/mod/guide_task/guide_task.go
similarity index 98%
rename from src/server/game/mod/guideTask/guideTask.go
rename to src/server/game/mod/guide_task/guide_task.go
index 8c525882..41a75462 100644
--- a/src/server/game/mod/guideTask/guideTask.go
+++ b/src/server/game/mod/guide_task/guide_task.go
@@ -2,10 +2,10 @@ package guideTask
 
 import (
 	"fmt"
-	"server/GoUtil"
-	GuideTaskCfg "server/conf/guideTask"
+	GuideTaskCfg "server/conf/guide_task"
 	"server/game/mod/item"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/handbook/Handbook.go b/src/server/game/mod/handbook/Handbook.go
index 25b9edc6..e5a27346 100644
--- a/src/server/game/mod/handbook/Handbook.go
+++ b/src/server/game/mod/handbook/Handbook.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	handbookCfg "server/conf/handbook"
-	startMergeCfg "server/conf/startMerge"
+	startMergeCfg "server/conf/start_merge"
 	"server/game/mod/item"
 	"server/msg"
 )
diff --git a/src/server/game/mod/invite/invite.go b/src/server/game/mod/invite/invite.go
index 842bbe3e..cec09006 100644
--- a/src/server/game/mod/invite/invite.go
+++ b/src/server/game/mod/invite/invite.go
@@ -2,9 +2,9 @@ package invite
 
 import (
 	"fmt"
-	"server/GoUtil"
 	inviteCfg "server/conf/invite"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go b/src/server/game/mod/limited_time_event/limited_time_event.go
similarity index 99%
rename from src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go
rename to src/server/game/mod/limited_time_event/limited_time_event.go
index 8bc6f24b..218c8ae3 100644
--- a/src/server/game/mod/limitedTimeEvent/LimitedTimeEvent.go
+++ b/src/server/game/mod/limited_time_event/limited_time_event.go
@@ -3,10 +3,10 @@ package limitedTimeEvent
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
-	mergeDataCfg "server/conf/mergeData"
+	limitedTimeEventCfg "server/conf/limited_time_event"
+	mergeDataCfg "server/conf/merge_data"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/mail/Mail.go b/src/server/game/mod/mail/Mail.go
index b1cd2750..53e08245 100644
--- a/src/server/game/mod/mail/Mail.go
+++ b/src/server/game/mod/mail/Mail.go
@@ -2,8 +2,8 @@ package mail
 
 import (
 	"fmt"
-	"server/GoUtil"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/order/Order.go b/src/server/game/mod/order/Order.go
index 24356935..b2247924 100644
--- a/src/server/game/mod/order/Order.go
+++ b/src/server/game/mod/order/Order.go
@@ -2,11 +2,11 @@ package order
 
 import (
 	"fmt"
-	"server/GoUtil"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
-	mergeDataCfg "server/conf/mergeData"
+	limitedTimeEventCfg "server/conf/limited_time_event"
+	mergeDataCfg "server/conf/merge_data"
 	orderCfg "server/conf/order"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 	"strings"
 	"time"
diff --git a/src/server/game/mod/order/OrderFunc.go b/src/server/game/mod/order/order_func.go
similarity index 99%
rename from src/server/game/mod/order/OrderFunc.go
rename to src/server/game/mod/order/order_func.go
index 91cabb17..653a4344 100644
--- a/src/server/game/mod/order/OrderFunc.go
+++ b/src/server/game/mod/order/order_func.go
@@ -3,10 +3,10 @@ package order
 import (
 	"log"
 	"math"
-	"server/GoUtil"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	orderCfg "server/conf/order"
 	userCfg "server/conf/user"
+	GoUtil "server/game_util"
 	"sort"
 )
 
diff --git a/src/server/game/mod/pass/Pass.go b/src/server/game/mod/pass/Pass.go
index 9109d535..c1c13f8b 100644
--- a/src/server/game/mod/pass/Pass.go
+++ b/src/server/game/mod/pass/Pass.go
@@ -1,9 +1,9 @@
 package pass
 
 import (
-	"server/GoUtil"
 	passCfg "server/conf/pass"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 type PassMod struct {
diff --git a/src/server/game/mod/piggyBank/piggyBank.go b/src/server/game/mod/piggy_bank/piggy_bank.go
similarity index 98%
rename from src/server/game/mod/piggyBank/piggyBank.go
rename to src/server/game/mod/piggy_bank/piggy_bank.go
index faeac010..db4174ff 100644
--- a/src/server/game/mod/piggyBank/piggyBank.go
+++ b/src/server/game/mod/piggy_bank/piggy_bank.go
@@ -1,9 +1,9 @@
 package piggyBank
 
 import (
-	"server/GoUtil"
 	chargeCfg "server/conf/charge"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/playroom/playroom.go b/src/server/game/mod/playroom/playroom.go
index 2883bc5a..2a7b85c9 100644
--- a/src/server/game/mod/playroom/playroom.go
+++ b/src/server/game/mod/playroom/playroom.go
@@ -3,11 +3,11 @@ package playroom
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
+	limitedTimeEventCfg "server/conf/limited_time_event"
 	playroomCfg "server/conf/playroom"
 	"server/game/mod/item"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 	"sort"
 )
diff --git a/src/server/game/mod/quest/Quest.go b/src/server/game/mod/quest/Quest.go
index 1620dbf0..41a05914 100644
--- a/src/server/game/mod/quest/Quest.go
+++ b/src/server/game/mod/quest/Quest.go
@@ -2,7 +2,7 @@ package quest
 
 import (
 	"fmt"
-	"server/GoUtil"
+	GoUtil "server/game_util"
 	"server/msg"
 	"strconv"
 	"strings"
diff --git a/src/server/game/mod/race/race.go b/src/server/game/mod/race/race.go
index 9122ae13..2a5b1628 100644
--- a/src/server/game/mod/race/race.go
+++ b/src/server/game/mod/race/race.go
@@ -3,10 +3,10 @@ package race
 import (
 	"fmt"
 	"math/rand"
-	"server/GoUtil"
 	raceCfg "server/conf/race"
 	randnameCfg "server/conf/randname"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 )
 
 type RaceMod struct {
diff --git a/src/server/game/mod/sevenLogin/SevenLogin.go b/src/server/game/mod/seven_login/seven_login.go
similarity index 98%
rename from src/server/game/mod/sevenLogin/SevenLogin.go
rename to src/server/game/mod/seven_login/seven_login.go
index 0795678a..eefd54a2 100644
--- a/src/server/game/mod/sevenLogin/SevenLogin.go
+++ b/src/server/game/mod/seven_login/seven_login.go
@@ -2,9 +2,9 @@ package sevenLogin
 
 import (
 	"fmt"
-	"server/GoUtil"
-	sevenLoginCfg "server/conf/sevenLogin"
+	sevenLoginCfg "server/conf/seven_login"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/msg"
 )
 
diff --git a/src/server/game/mod/sevenLogin/SevenLoginFunc.go b/src/server/game/mod/seven_login/seven_login_func.go
similarity index 98%
rename from src/server/game/mod/sevenLogin/SevenLoginFunc.go
rename to src/server/game/mod/seven_login/seven_login_func.go
index 2f1257fa..f86a0b6f 100644
--- a/src/server/game/mod/sevenLogin/SevenLoginFunc.go
+++ b/src/server/game/mod/seven_login/seven_login_func.go
@@ -2,9 +2,9 @@ package sevenLogin
 
 import (
 	"math/rand/v2"
-	"server/GoUtil"
-	sevenLoginCfg "server/conf/sevenLogin"
+	sevenLoginCfg "server/conf/seven_login"
 	"server/game/mod/item"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"sort"
 )
diff --git a/src/server/game/PlayerBack.go b/src/server/game/player_back.go
similarity index 99%
rename from src/server/game/PlayerBack.go
rename to src/server/game/player_back.go
index e4fc9bc1..839b5b31 100644
--- a/src/server/game/PlayerBack.go
+++ b/src/server/game/player_back.go
@@ -1,11 +1,11 @@
 package game
 
 import (
-	"server/GoUtil"
 	chargeCfg "server/conf/charge"
 	playroomCfg "server/conf/playroom"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
+	GoUtil "server/game_util"
 	proto "server/msg"
 )
 
diff --git a/src/server/game/PlayerBaseMod.go b/src/server/game/player_base_mod.go
similarity index 99%
rename from src/server/game/PlayerBaseMod.go
rename to src/server/game/player_base_mod.go
index cd994d00..bc236c2a 100644
--- a/src/server/game/PlayerBaseMod.go
+++ b/src/server/game/player_base_mod.go
@@ -9,7 +9,7 @@ import (
 	userCfg "server/conf/user"
 	"server/db"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	Msg "server/game/mod/msg"
 	"server/game/mod/order"
 	"server/game/mod/quest"
diff --git a/src/server/game/PlayerChessMod.go b/src/server/game/player_chess_mod.go
similarity index 99%
rename from src/server/game/PlayerChessMod.go
rename to src/server/game/player_chess_mod.go
index b875d1e0..b78fc485 100644
--- a/src/server/game/PlayerChessMod.go
+++ b/src/server/game/player_chess_mod.go
@@ -3,14 +3,14 @@ package game
 import (
 	"fmt"
 	"math"
-	"server/GoUtil"
 	"server/conf"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	orderCfg "server/conf/order"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	"server/game/mod/order"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"
diff --git a/src/server/game/Player.go b/src/server/game/player_data.go
similarity index 99%
rename from src/server/game/Player.go
rename to src/server/game/player_data.go
index 822e9fed..aa6b369b 100644
--- a/src/server/game/Player.go
+++ b/src/server/game/player_data.go
@@ -6,14 +6,13 @@ import (
 	"encoding/json"
 	"errors"
 	"math"
-	"server/GoUtil"
 	activityCfg "server/conf/activity"
 	cardCfg "server/conf/card"
 	chargeCfg "server/conf/charge"
-	guesscolorCfg "server/conf/guessColor"
+	guesscolorCfg "server/conf/guess_color"
 	itemCfg "server/conf/item"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
-	mergeDataCfg "server/conf/mergeData"
+	limitedTimeEventCfg "server/conf/limited_time_event"
+	mergeDataCfg "server/conf/merge_data"
 	miningCfg "server/conf/mining"
 	playroomCfg "server/conf/playroom"
 	"server/db"
@@ -21,10 +20,11 @@ import (
 	"server/game/mod/activity"
 	"server/game/mod/friend"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	MsgMod "server/game/mod/msg"
 	"server/game/mod/playroom"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 	telog "server/thinkdata"
 	"strconv"
diff --git a/src/server/game/PlayerLog.go b/src/server/game/player_log.go
similarity index 100%
rename from src/server/game/PlayerLog.go
rename to src/server/game/player_log.go
diff --git a/src/server/game/PlayerMod.go b/src/server/game/player_mod.go
similarity index 97%
rename from src/server/game/PlayerMod.go
rename to src/server/game/player_mod.go
index 939ba214..543b09e6 100644
--- a/src/server/game/PlayerMod.go
+++ b/src/server/game/player_mod.go
@@ -16,29 +16,29 @@ import (
 	"server/game/mod/chess"
 	"server/game/mod/collect"
 	"server/game/mod/compensation"
-	"server/game/mod/dailyTask"
+	dailyTask "server/game/mod/daily_task"
 	"server/game/mod/decorate"
 	"server/game/mod/emoji"
 	"server/game/mod/endless"
 	"server/game/mod/face"
 	"server/game/mod/friend"
-	"server/game/mod/friendTreasure.go"
-	guesscolor "server/game/mod/guessColor"
+	friendTreasure "server/game/mod/friend_treasure.go"
+	guesscolor "server/game/mod/guess_color"
 	"server/game/mod/guide"
-	"server/game/mod/guideTask"
+	guideTask "server/game/mod/guide_task"
 	"server/game/mod/handbook"
 	"server/game/mod/invite"
 	"server/game/mod/item"
 	"server/game/mod/kv"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	"server/game/mod/mail"
 	"server/game/mod/mining"
 	"server/game/mod/order"
 	"server/game/mod/pass"
-	"server/game/mod/piggyBank"
+	piggyBank "server/game/mod/piggy_bank"
 	"server/game/mod/playroom"
 	"server/game/mod/race"
-	"server/game/mod/sevenLogin"
+	sevenLogin "server/game/mod/seven_login"
 	Var "server/game/mod/var"
 	"server/pkg/github.com/name5566/leaf/log"
 	"time"
diff --git a/src/server/game/RankMgr.go b/src/server/game/rank_mgr.go
similarity index 99%
rename from src/server/game/RankMgr.go
rename to src/server/game/rank_mgr.go
index fc576794..a3bbdbe0 100644
--- a/src/server/game/RankMgr.go
+++ b/src/server/game/rank_mgr.go
@@ -2,10 +2,10 @@ package game
 
 import (
 	"fmt"
-	"server/GoUtil"
 	"server/conf"
 	"server/db"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"sort"
 	"strconv"
 )
diff --git a/src/server/game/RegisterNetworkFunc.go b/src/server/game/register_network_func.go
similarity index 99%
rename from src/server/game/RegisterNetworkFunc.go
rename to src/server/game/register_network_func.go
index 5531aa04..01fbcb90 100644
--- a/src/server/game/RegisterNetworkFunc.go
+++ b/src/server/game/register_network_func.go
@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"math"
-	"server/GoUtil"
 	"server/conf"
 	baseCfg "server/conf/base"
 	cardCfg "server/conf/card"
@@ -12,10 +11,10 @@ import (
 	collectCfg "server/conf/collect"
 	decorateCfg "server/conf/decorate"
 	emojiCfg "server/conf/emoji"
-	GuideTaskCfg "server/conf/guideTask"
+	GuideTaskCfg "server/conf/guide_task"
 	handbookCfg "server/conf/handbook"
-	limitedTimeEventCfg "server/conf/limitedTimeEvent"
-	mergeDataCfg "server/conf/mergeData"
+	limitedTimeEventCfg "server/conf/limited_time_event"
+	mergeDataCfg "server/conf/merge_data"
 	miningCfg "server/conf/mining"
 	orderCfg "server/conf/order"
 	playroomCfg "server/conf/playroom"
@@ -26,12 +25,13 @@ import (
 	"server/game/mod/collect"
 	"server/game/mod/friend"
 	"server/game/mod/item"
-	"server/game/mod/limitedTimeEvent"
+	limitedTimeEvent "server/game/mod/limited_time_event"
 	MsqMod "server/game/mod/msg"
 	"server/game/mod/order"
-	"server/game/mod/piggyBank"
+	piggyBank "server/game/mod/piggy_bank"
 	"server/game/mod/playroom"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 	"strconv"
 
diff --git a/src/server/game/ServerMod.go b/src/server/game/server_mod.go
similarity index 99%
rename from src/server/game/ServerMod.go
rename to src/server/game/server_mod.go
index 158c5c41..310b5233 100644
--- a/src/server/game/ServerMod.go
+++ b/src/server/game/server_mod.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"server/GoUtil"
 	"server/db"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"server/pkg/github.com/name5566/leaf/log"
 	"server/pkg/github.com/name5566/leaf/timer"
 	"sync"
diff --git a/src/server/game/Trigger.go b/src/server/game/trigger_func.go
similarity index 99%
rename from src/server/game/Trigger.go
rename to src/server/game/trigger_func.go
index 4e9b475f..3d271bff 100644
--- a/src/server/game/Trigger.go
+++ b/src/server/game/trigger_func.go
@@ -4,20 +4,20 @@ import (
 	"encoding/json"
 	"fmt"
 	"math"
-	"server/GoUtil"
 	"server/MergeConst"
 	"server/conf"
 	champshipCfg "server/conf/champship"
 	chargeCfg "server/conf/charge"
 	languageCfg "server/conf/language"
 	mailCfg "server/conf/mail"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	"server/db"
 	"server/game/mod/chess"
 	"server/game/mod/item"
 	"server/game/mod/mail"
 	"server/game/mod/order"
 	"server/game/mod/quest"
+	GoUtil "server/game_util"
 	"server/msg"
 	"server/pkg/github.com/name5566/leaf/log"
 	"sort"
diff --git a/src/server/game/UnitTest.go b/src/server/game/unit_test.go
similarity index 99%
rename from src/server/game/UnitTest.go
rename to src/server/game/unit_test.go
index 25662c4a..746caa13 100644
--- a/src/server/game/UnitTest.go
+++ b/src/server/game/unit_test.go
@@ -5,7 +5,7 @@ import (
 	"encoding/gob"
 	"fmt"
 	"math"
-	mergeDataCfg "server/conf/mergeData"
+	mergeDataCfg "server/conf/merge_data"
 	orderCfg "server/conf/order"
 	"server/game/mod/decorate"
 	"server/game/mod/item"
diff --git a/src/server/game/VarMgr.go b/src/server/game/var_mgr.go
similarity index 99%
rename from src/server/game/VarMgr.go
rename to src/server/game/var_mgr.go
index 70c343f4..a228b5fd 100644
--- a/src/server/game/VarMgr.go
+++ b/src/server/game/var_mgr.go
@@ -3,9 +3,9 @@ package game
 import (
 	"encoding/gob"
 	"fmt"
-	"server/GoUtil"
 	"server/game/mod/card"
 	"server/game/mod/msg"
+	GoUtil "server/game_util"
 	"time"
 )
 
diff --git a/src/server/game_rpc/admin_server.go b/src/server/game_rpc/admin_server.go
new file mode 100644
index 00000000..4930cd7d
--- /dev/null
+++ b/src/server/game_rpc/admin_server.go
@@ -0,0 +1 @@
+package gamerpc
diff --git a/src/server/GoUtil/AliyunSmsApi.go b/src/server/game_util/AliyunSmsApi.go
similarity index 100%
rename from src/server/GoUtil/AliyunSmsApi.go
rename to src/server/game_util/AliyunSmsApi.go
diff --git a/src/server/GoUtil/GoUtil.go b/src/server/game_util/GoUtil.go
similarity index 100%
rename from src/server/GoUtil/GoUtil.go
rename to src/server/game_util/GoUtil.go
diff --git a/src/server/GoUtil/AliyunOpenApi.go b/src/server/game_util/aliyun_open_api.go
similarity index 100%
rename from src/server/GoUtil/AliyunOpenApi.go
rename to src/server/game_util/aliyun_open_api.go
diff --git a/src/server/GoUtil/feishu.go b/src/server/game_util/feishu.go
similarity index 100%
rename from src/server/GoUtil/feishu.go
rename to src/server/game_util/feishu.go
diff --git a/src/server/GoUtil/mapUtil.go b/src/server/game_util/mapUtil.go
similarity index 97%
rename from src/server/GoUtil/mapUtil.go
rename to src/server/game_util/mapUtil.go
index 6025547a..26aa25c8 100644
--- a/src/server/GoUtil/mapUtil.go
+++ b/src/server/game_util/mapUtil.go
@@ -1,7 +1,7 @@
 package GoUtil
 
 import (
-	dailyTaskCfg "server/conf/dailyTask"
+	dailyTaskCfg "server/conf/daily_task"
 	"server/game/mod/item"
 )
 
diff --git a/src/server/GoUtil/mathUtil.go b/src/server/game_util/mathUtil.go
similarity index 100%
rename from src/server/GoUtil/mathUtil.go
rename to src/server/game_util/mathUtil.go
diff --git a/src/server/GoUtil/randUtil.go b/src/server/game_util/randUtil.go
similarity index 100%
rename from src/server/GoUtil/randUtil.go
rename to src/server/game_util/randUtil.go
diff --git a/src/server/GoUtil/sliceUtil.go b/src/server/game_util/sliceUtil.go
similarity index 100%
rename from src/server/GoUtil/sliceUtil.go
rename to src/server/game_util/sliceUtil.go
diff --git a/src/server/GoUtil/timeUtil.go b/src/server/game_util/timeUtil.go
similarity index 100%
rename from src/server/GoUtil/timeUtil.go
rename to src/server/game_util/timeUtil.go
diff --git a/src/server/gamedata/configStruct.go b/src/server/gamedata/config_struct.go
similarity index 100%
rename from src/server/gamedata/configStruct.go
rename to src/server/gamedata/config_struct.go
diff --git a/src/server/pay/google.go b/src/server/pay/google.go
deleted file mode 100644
index 5eb6a64a..00000000
--- a/src/server/pay/google.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package pay
-
-import (
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"time"
-)
-
-var (
-	PackageName  = "com.DefaultCompany.PetHomeMergeStory" //包名
-	GrantType    = "refresh_token"
-	ClientId     = "757279522891-nrfqc345ng13d92br5cd579e1k7f2jsj.apps.googleusercontent.com"                                //客户端id
-	ClientSecret = "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"                                                                     //客户端秘钥
-	RefreshToken = "1//0ewdqw7P83uNRCgYIARAAGA4SNwF-L9IreCVIYzd-6T5Cz0J-UoAqdbGL7AmB849q_YKy7CbvJIjmvwQelezgs1utmU4nDI4_kWU" //RefreshToken，上面第二步获取的
-)
-
-const (
-	PAY_STATUS_SUCCESS = 1
-	PAY_STATUS_FAIL    = 0
-)
-
-type TokenInfo struct {
-	AccessToken string `json:"access_token"`
-	ExpiresIn   int    `json:"expires_in"`
-	Scope       string `json:"scope"`
-	TokenType   string `json:"token_type"`
-}
-
-type OrderInfo struct {
-	Kind                 string `json:"kind"`
-	PurchaseTimeMillis   string `json:"purchaseTimeMillis"`   // 支付时间, 毫秒
-	PurchaseState        int    `json:"purchaseState"`        // 是否付费: 0 已支付, 1 取消
-	ConsumptionState     int    `json:"consumptionState"`     // 是否被消费: 0 未消费, 1 已消费
-	DeveloperPayload     string `json:"developerPayload"`     // 开发者透传参数
-	OrderId              string `json:"orderId"`              // 谷歌订单号
-	AcknowledgementState int    `json:"acknowledgementState"` // 支付类型:  0 测试, 1 真实
-}
-
-// 获取token凭证
-func PostRefreshToken() (*TokenInfo, error) {
-	client := &http.Client{
-		Timeout: 10 * time.Second,
-	}
-
-	var resp *http.Response
-	var err error
-	for i := 0; i < 3; i++ { // 重试3次
-		resp, err = client.PostForm("https://accounts.google.com/o/oauth2/token", url.Values{
-			"grant_type":    {GrantType},
-			"client_id":     {ClientId},
-			"client_secret": {ClientSecret},
-			"refresh_token": {RefreshToken},
-		})
-		if err == nil {
-			break
-		}
-		fmt.Printf("PostToken attempt %d failed: %v\n", i+1, err)
-		time.Sleep(2 * time.Second) // 等待2秒后重试
-	}
-	if err != nil {
-		return nil, fmt.Errorf("PostToken err:%v", err)
-	}
-	defer resp.Body.Close()
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println("PostToken body err:", err)
-	}
-	fmt.Println("token:", string(body))
-	info := new(TokenInfo)
-	err = json.Unmarshal(body, &info)
-	if err != nil {
-		return nil, fmt.Errorf("PostToken Unmarshal err:%v", err)
-	}
-	fmt.Println("token info:", info)
-	return info, nil
-}
-
-// 获取订单信息
-func GetOrder(productId, token, accessToken string) (*OrderInfo, error) {
-	client := &http.Client{
-		Transport: &http.Transport{
-			TLSClientConfig: &tls.Config{
-				Certificates: []tls.Certificate{},
-			},
-		},
-	}
-	resp, err := client.Get("https://www.googleapis.com/androidpublisher/v3/applications/" +
-		PackageName + "/purchases/products/" + productId + "/tokens/" + token + "?access_token=" + accessToken + "")
-	if err != nil {
-		return nil, fmt.Errorf("GetOrder err:%v", err)
-	}
-	defer resp.Body.Close()
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		fmt.Println("GetOrder body err:", err)
-	}
-	fmt.Println("GetOrder：", string(body))
-	info := new(OrderInfo)
-	err = json.Unmarshal(body, &info)
-	if err != nil {
-		return nil, fmt.Errorf("GetOrder Unmarshal err:%v", err)
-	}
-	fmt.Println("GetOrder info:", info)
-	return info, nil
-}
diff --git a/src/server/pkg/github.com/name5566/leaf/leaf.go b/src/server/pkg/github.com/name5566/leaf/leaf.go
index fe75877b..b7ad1ac6 100644
--- a/src/server/pkg/github.com/name5566/leaf/leaf.go
+++ b/src/server/pkg/github.com/name5566/leaf/leaf.go
@@ -3,10 +3,10 @@ package leaf
 import (
 	"os"
 	"os/signal"
-	"server/GoUtil"
 	mergeCluster "server/cluster"
 	sconf "server/conf"
 	"server/game"
+	GoUtil "server/game_util"
 	"server/gamedata"
 	"server/pkg/github.com/name5566/leaf/cluster"
 	"server/pkg/github.com/name5566/leaf/conf"