diff --git a/internal/erpserver/handler/handler.go b/internal/erpserver/handler/handler.go index b4e2084..91b8323 100644 --- a/internal/erpserver/handler/handler.go +++ b/internal/erpserver/handler/handler.go @@ -1,8 +1,6 @@ package handler import ( - "net/http" - "management/internal/config" "management/internal/erpserver/biz" "management/internal/erpserver/handler/common" @@ -15,10 +13,6 @@ import ( type IHandler interface { // 获取 Common Handler 接口. CommonHandler() common.CommonHandler - - // 获取首页 - Home(w http.ResponseWriter, req *http.Request) - // 获取 System Handler 接口. SystemHandler() system.SystemHandler } diff --git a/internal/erpserver/handler/home.go b/internal/erpserver/handler/home.go deleted file mode 100644 index 24b8b90..0000000 --- a/internal/erpserver/handler/home.go +++ /dev/null @@ -1,7 +0,0 @@ -package handler - -import "net/http" - -func (h *handler) Home(w http.ResponseWriter, r *http.Request) { - h.render.HTML(w, r, "home/home.tmpl", nil) -} diff --git a/internal/erpserver/handler/system/system.go b/internal/erpserver/handler/system/system.go index 608fba1..9bbe6e4 100644 --- a/internal/erpserver/handler/system/system.go +++ b/internal/erpserver/handler/system/system.go @@ -1,12 +1,15 @@ package system import ( + "net/http" + "management/internal/erpserver/biz" "management/internal/pkg/session" "management/internal/pkg/tpl" ) type SystemHandler interface { + Home(w http.ResponseWriter, req *http.Request) UserHandler() UserHandler MenuHandler() MenuHandler DepartmentHandler() DepartmentHandler @@ -29,6 +32,10 @@ func NewSystemHandler(render tpl.Renderer, session session.ISession, biz biz.IBi } } +func (h *systemHandler) Home(w http.ResponseWriter, r *http.Request) { + h.render.HTML(w, r, "home/home.tmpl", nil) +} + func (h *systemHandler) UserHandler() UserHandler { return NewUserHandler(h.render, h.session, h.biz) } diff --git a/internal/erpserver/http.go b/internal/erpserver/http.go index 96429b5..95b87bf 100644 --- a/internal/erpserver/http.go +++ b/internal/erpserver/http.go @@ -38,7 +38,7 @@ func NewRouter(handler handler.IHandler, mw mw.IMiddleware) *chi.Mux { // r.With(auth.Authorize, mw.Audit).Post("/upload/file", commonhandler.UploadFile) // r.With(auth.Authorize, mw.Audit).Post("/upload/mutilfile", commonhandler.UploadMutilFiles) - r.With(mw.Authorize, mw.Audit).Get("/home.html", handler.Home) + r.With(mw.Authorize, mw.Audit).Get("/home.html", handler.SystemHandler().Home) r.With(mw.Authorize).Get("/pear.json", handler.SystemHandler().ConfigHandler().Pear) r.Route("/system", func(r chi.Router) {