From 33c2d6a62286f8d83d620c4bc341538091dd63e2 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 7 Sep 2023 12:53:44 +0800
Subject: [PATCH] 1

---
 server/hallserver/app/app.go               | 14 +-------------
 server/hallserver/initialize/enter.go      | 11 +++++++++--
 server/hallserver/listener/export.go       |  8 ++++++++
 server/hallserver/listener/handlermgr.go   |  4 ++--
 server/hallserver/listener/httplistener.go |  4 ++--
 server/hallserver/main.go                  |  6 ++----
 6 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/server/hallserver/app/app.go b/server/hallserver/app/app.go
index e7eb970e..fe657600 100644
--- a/server/hallserver/app/app.go
+++ b/server/hallserver/app/app.go
@@ -2,9 +2,8 @@ package app
 
 import (
 	"f5"
-	"mt"
 	"q5"
-	_ "main/initialize"
+	"mt"
 	. "main/common"
 )
 
@@ -20,20 +19,9 @@ func (this *app) Init() {
 	this.netMsgQueue.Init()
 	f5.LoadMetaTable(mt.Table)
 	this.registerDataSources()
-
-	//handlerMgr.init()
-	//playerMgr.init()
-	//wspListener.init()
-	//httpListener.init()
-	//roomMgr.init()
 }
 
 func (this *app) UnInit() {
-	//roomMgr.unInit()
-	//httpListener.unInit()
-	//playerMgr.unInit()
-	//handlerMgr.unInit()
-	//wspListener.unInit()
 }
 
 func (this *app) Update() {
diff --git a/server/hallserver/initialize/enter.go b/server/hallserver/initialize/enter.go
index b2f1ba5f..68995a54 100644
--- a/server/hallserver/initialize/enter.go
+++ b/server/hallserver/initialize/enter.go
@@ -1,14 +1,21 @@
 package initialize
 
 import (
+	"f5"
+
 	"main/global"
 	"main/room"
 	"main/player"
 	"main/listener"
+	"main/app"
 )
 
-func init() {
-	global.SetRoomMgr(room.GetRoomMgr())
+func Init() {
+	app.GetApp().Init()
+	listener.GetHandlerMgr().Init()
 	global.SetPlayerMgr(player.GetPlayerMgr())
+	global.SetRoomMgr(room.GetRoomMgr())
 	global.SetWspListener(listener.GetWspListener())
+	listener.GetHttpListener().Init()
+	f5.Run(app.GetApp())
 }
diff --git a/server/hallserver/listener/export.go b/server/hallserver/listener/export.go
index a0abca62..4d955b71 100644
--- a/server/hallserver/listener/export.go
+++ b/server/hallserver/listener/export.go
@@ -3,3 +3,11 @@ package listener
 func GetWspListener() *WSPListener {
 	return nil
 }
+
+func GetHandlerMgr() *HandlerMgr {
+	return nil
+}
+
+func GetHttpListener() *httpListener {
+	return nil
+}
diff --git a/server/hallserver/listener/handlermgr.go b/server/hallserver/listener/handlermgr.go
index 238a25bf..a5e372ba 100644
--- a/server/hallserver/listener/handlermgr.go
+++ b/server/hallserver/listener/handlermgr.go
@@ -10,7 +10,7 @@ import (
 type HandlerMgr struct {
 }
 
-func (this *HandlerMgr) init() {
+func (this *HandlerMgr) Init() {
 	ss.RegHandlerId(int(ss.SSMessageIdE__SS_Ping), WSP_LISTENER_HANDLER_ID)
 	ss.RegHandlerId(int(ss.SSMessageIdE__SS_WSP_SocketDisconnect), WSP_LISTENER_HANDLER_ID)
 
@@ -18,5 +18,5 @@ func (this *HandlerMgr) init() {
 	cs.RegHandlerId(int(cs.CMMessageIdE__CMLogin), PLAYER_MGR_HANDLER_ID)
 }
 
-func (this *HandlerMgr) unInit() {
+func (this *HandlerMgr) UnInit() {
 }
diff --git a/server/hallserver/listener/httplistener.go b/server/hallserver/listener/httplistener.go
index c27a1dbe..28bd86ed 100644
--- a/server/hallserver/listener/httplistener.go
+++ b/server/hallserver/listener/httplistener.go
@@ -9,11 +9,11 @@ type httpListener struct {
 	httpServer *f5.HttpServer
 }
 
-func (this *httpListener) init() {
+func (this *httpListener) Init() {
 	this.httpServer = new (f5.HttpServer)
 	this.httpServer.Init("imserver.httplistener", 1000 * 10)
 	this.httpServer.Start(mt.Table.HallCluster.GetHttpListenPort())
 }
 
-func (this *httpListener) unInit() {
+func (this *httpListener) UnInit() {
 }
diff --git a/server/hallserver/main.go b/server/hallserver/main.go
index b84a5712..ac0e77e9 100644
--- a/server/hallserver/main.go
+++ b/server/hallserver/main.go
@@ -1,11 +1,9 @@
 package main
 
 import (
-	"f5"
-
-	"main/app"
+	"main/initialize"
 )
 
 func main() {
-	f5.Run(app.GetApp())
+	initialize.Init()
 }