diff --git a/server/mailserver/common/types.go b/server/mailserver/common/types.go index e2e714cf..fd007926 100644 --- a/server/mailserver/common/types.go +++ b/server/mailserver/common/types.go @@ -17,3 +17,5 @@ type Player interface { type PlayerMgr interface{} type Mail interface{} type MailMgr interface{} + +type ControllerMgr interface{} diff --git a/server/mailserver/constant/constant.go b/server/mailserver/constant/constant.go index da082436..d3f9195c 100644 --- a/server/mailserver/constant/constant.go +++ b/server/mailserver/constant/constant.go @@ -12,6 +12,7 @@ const ( APP_MODULE_IDX = iota PLAYER_MGR_MODULE_IDX MAIL_MGR_MODULE_IDX + CONTROLLER_MGR_MODULE_IDX MAX_MODULE_IDX ) diff --git a/server/mailserver/controller/controllermgr.go b/server/mailserver/controller/controllermgr.go new file mode 100644 index 00000000..1c31bc12 --- /dev/null +++ b/server/mailserver/controller/controllermgr.go @@ -0,0 +1,24 @@ +package controller + +import ( + "f5" + "main/middleware" +) + +type ControllerMgr struct { + +} + +func (this* ControllerMgr) Init() { + f5.GetApp().GetGinEngine().Use(middleware.CaForward) + f5.GetApp().GetGinEngine().Use(middleware.CaAuth) + f5.GetApp().RegisterCaHandle("mail", "getMailList", mail_getMail) + f5.GetApp().RegisterCaHandle("mail", "markMail", mail_markMail) + f5.GetApp().RegisterCaHandle("mail", "getUnreadMailCnt", mail_getUnreadMailCnt) + f5.GetApp().RegisterCaHandle("mail", "getAttachment", mail_getAttachment) + f5.GetApp().RegisterCaHandle("mail", "deleteMails", mail_deleteMails) +} + +func (this* ControllerMgr) UnInit() { + +} diff --git a/server/mailserver/controller/enter.go b/server/mailserver/controller/enter.go index cbe37cb2..3761a3f3 100644 --- a/server/mailserver/controller/enter.go +++ b/server/mailserver/controller/enter.go @@ -1,13 +1,5 @@ package controller -import ( - "f5" -) func init() { - f5.GetApp().RegisterCaHandle("mail", "getMailList", mail_getMail) - f5.GetApp().RegisterCaHandle("mail", "markMail", mail_markMail) - f5.GetApp().RegisterCaHandle("mail", "getUnreadMailCnt", mail_getUnreadMailCnt) - f5.GetApp().RegisterCaHandle("mail", "getAttachment", mail_getAttachment) - f5.GetApp().RegisterCaHandle("mail", "deleteMails", mail_deleteMails) } diff --git a/server/mailserver/global/global.go b/server/mailserver/global/global.go index 589e9fe4..19f1e9aa 100644 --- a/server/mailserver/global/global.go +++ b/server/mailserver/global/global.go @@ -11,11 +11,13 @@ var modules [constant.MAX_MODULE_IDX]q5.Module var initOrders = []int32{ constant.PLAYER_MGR_MODULE_IDX, constant.MAIL_MGR_MODULE_IDX, + constant.CONTROLLER_MGR_MODULE_IDX, } var app common.App var playerMgr common.PlayerMgr var mailMgr common.MailMgr +var controllerMgr common.ControllerMgr func GetApp() common.App { return app @@ -45,6 +47,10 @@ func RegModule(idx int32, m q5.Module) { { mailMgr = m.(common.MailMgr) } + case constant.CONTROLLER_MGR_MODULE_IDX: + { + controllerMgr = m.(common.ControllerMgr) + } default: { panic("unknow module") diff --git a/server/mailserver/middleware/caauth.go b/server/mailserver/middleware/caauth.go index 2c165c72..a4a07b2a 100644 --- a/server/mailserver/middleware/caauth.go +++ b/server/mailserver/middleware/caauth.go @@ -2,8 +2,9 @@ package middleware import ( "github.com/gin-gonic/gin" + "f5" ) func CaAuth(c *gin.Context) { - + f5.GetSysLog().Info("CaAuth") } diff --git a/server/mailserver/middleware/caforward.go b/server/mailserver/middleware/caforward.go index e7ddf450..e21131ca 100644 --- a/server/mailserver/middleware/caforward.go +++ b/server/mailserver/middleware/caforward.go @@ -2,8 +2,9 @@ package middleware import ( "github.com/gin-gonic/gin" + "f5" ) func CaForward(c *gin.Context) { - + f5.GetSysLog().Info("CaForward") }