diff --git a/server/internal/admin/admin.go b/server/internal/admin/admin.go index a05bfce3..38ce6bef 100644 --- a/server/internal/admin/admin.go +++ b/server/internal/admin/admin.go @@ -7,8 +7,8 @@ import ( "flag" "fmt" + "github.com/JACKYMYPERSON/hldrCenter/internal/admin/handler" "github.com/JACKYMYPERSON/hldrCenter/internal/admin/internal/config" - "github.com/JACKYMYPERSON/hldrCenter/internal/admin/internal/handler" "github.com/JACKYMYPERSON/hldrCenter/internal/admin/internal/svc" "github.com/zeromicro/go-zero/core/conf" diff --git a/server/internal/admin/etc/admin-api.yaml b/server/internal/admin/etc/admin-api.yaml deleted file mode 100644 index d7c0751b..00000000 --- a/server/internal/admin/etc/admin-api.yaml +++ /dev/null @@ -1,3 +0,0 @@ -Name: admin-api -Host: 0.0.0.0 -Port: 8888 diff --git a/server/internal/admin/internal/handler/admin/createadminhandler.go b/server/internal/admin/handler/admin/createadminhandler.go similarity index 100% rename from server/internal/admin/internal/handler/admin/createadminhandler.go rename to server/internal/admin/handler/admin/createadminhandler.go diff --git a/server/internal/admin/internal/handler/admin/deleteadminhandler.go b/server/internal/admin/handler/admin/deleteadminhandler.go similarity index 100% rename from server/internal/admin/internal/handler/admin/deleteadminhandler.go rename to server/internal/admin/handler/admin/deleteadminhandler.go diff --git a/server/internal/admin/internal/handler/admin/getadminhandler.go b/server/internal/admin/handler/admin/getadminhandler.go similarity index 100% rename from server/internal/admin/internal/handler/admin/getadminhandler.go rename to server/internal/admin/handler/admin/getadminhandler.go diff --git a/server/internal/admin/internal/handler/admin/listadminhandler.go b/server/internal/admin/handler/admin/listadminhandler.go similarity index 100% rename from server/internal/admin/internal/handler/admin/listadminhandler.go rename to server/internal/admin/handler/admin/listadminhandler.go diff --git a/server/internal/admin/internal/handler/admin/updateadminhandler.go b/server/internal/admin/handler/admin/updateadminhandler.go similarity index 100% rename from server/internal/admin/internal/handler/admin/updateadminhandler.go rename to server/internal/admin/handler/admin/updateadminhandler.go diff --git a/server/internal/admin/internal/config/config.go b/server/internal/admin/internal/config/config.go deleted file mode 100644 index 7fbd0898..00000000 --- a/server/internal/admin/internal/config/config.go +++ /dev/null @@ -1,10 +0,0 @@ -// Code scaffolded by goctl. Safe to edit. -// goctl 1.9.1 - -package config - -import "github.com/zeromicro/go-zero/rest" - -type Config struct { - rest.RestConf -} diff --git a/server/internal/admin/internal/handler/routes.go b/server/internal/admin/internal/handler/routes.go deleted file mode 100644 index 4d556d6d..00000000 --- a/server/internal/admin/internal/handler/routes.go +++ /dev/null @@ -1,46 +0,0 @@ -// Code generated by goctl. DO NOT EDIT. -// goctl 1.9.1 - -package handler - -import ( - "net/http" - - admin "github.com/JACKYMYPERSON/hldrCenter/internal/admin/internal/handler/admin" - "github.com/JACKYMYPERSON/hldrCenter/internal/admin/internal/svc" - - "github.com/zeromicro/go-zero/rest" -) - -func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { - server.AddRoutes( - []rest.Route{ - { - Method: http.MethodGet, - Path: "/admin", - Handler: admin.GetAdminHandler(serverCtx), - }, - { - Method: http.MethodPost, - Path: "/admin", - Handler: admin.CreateAdminHandler(serverCtx), - }, - { - Method: http.MethodPut, - Path: "/admin", - Handler: admin.UpdateAdminHandler(serverCtx), - }, - { - Method: http.MethodDelete, - Path: "/admin", - Handler: admin.DeleteAdminHandler(serverCtx), - }, - { - Method: http.MethodGet, - Path: "/admin/list", - Handler: admin.ListAdminHandler(serverCtx), - }, - }, - rest.WithPrefix("/api/admin"), - ) -} diff --git a/server/internal/admin/internal/svc/servicecontext.go b/server/internal/admin/internal/svc/servicecontext.go deleted file mode 100644 index 367174ed..00000000 --- a/server/internal/admin/internal/svc/servicecontext.go +++ /dev/null @@ -1,18 +0,0 @@ -// Code scaffolded by goctl. Safe to edit. -// goctl 1.9.1 - -package svc - -import ( - "github.com/JACKYMYPERSON/hldrCenter/internal/admin/internal/config" -) - -type ServiceContext struct { - Config config.Config -} - -func NewServiceContext(c config.Config) *ServiceContext { - return &ServiceContext{ - Config: c, - } -}