From 96d92ef360064123cf64726d564a27250a0d84f2 Mon Sep 17 00:00:00 2001 From: mayiming <1627832236@qq.com> Date: Sun, 2 Nov 2025 00:44:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E8=AF=BE=E7=A8=8B=E6=95=99?= =?UTF-8?q?=E5=AE=A4Handler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../course_teacher/courseteacherapi.go | 34 -------------- .../course_teacher/etc/courseteacherapi.yaml | 3 -- .../createcourseteacherhandler.go | 4 +- .../deletecourseteacherhandler.go | 4 +- .../course_teacher/getcourseteacherhandler.go | 4 +- .../listcourseteacherhandler.go | 4 +- .../updatecourseteacherhandler.go | 4 +- .../course_teacher/internal/config/config.go | 10 ---- .../course_teacher/internal/handler/routes.go | 46 ------------------- .../createcourseteacherlogic.go | 13 ++++-- .../deletecourseteacherlogic.go | 13 ++++-- .../course_teacher/getcourseteacherlogic.go | 13 ++++-- .../course_teacher/listcourseteacherlogic.go | 13 ++++-- .../updatecourseteacherlogic.go | 13 ++++-- .../internal/svc/servicecontext.go | 18 -------- 15 files changed, 50 insertions(+), 146 deletions(-) delete mode 100644 server/internal/course_teacher/courseteacherapi.go delete mode 100644 server/internal/course_teacher/etc/courseteacherapi.yaml rename server/internal/course_teacher/{internal => }/handler/course_teacher/createcourseteacherhandler.go (82%) rename server/internal/course_teacher/{internal => }/handler/course_teacher/deletecourseteacherhandler.go (82%) rename server/internal/course_teacher/{internal => }/handler/course_teacher/getcourseteacherhandler.go (82%) rename server/internal/course_teacher/{internal => }/handler/course_teacher/listcourseteacherhandler.go (82%) rename server/internal/course_teacher/{internal => }/handler/course_teacher/updatecourseteacherhandler.go (82%) delete mode 100644 server/internal/course_teacher/internal/config/config.go delete mode 100644 server/internal/course_teacher/internal/handler/routes.go delete mode 100644 server/internal/course_teacher/internal/svc/servicecontext.go diff --git a/server/internal/course_teacher/courseteacherapi.go b/server/internal/course_teacher/courseteacherapi.go deleted file mode 100644 index e53375a5..00000000 --- a/server/internal/course_teacher/courseteacherapi.go +++ /dev/null @@ -1,34 +0,0 @@ -// Code scaffolded by goctl. Safe to edit. -// goctl 1.9.1 - -package main - -import ( - "flag" - "fmt" - - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/config" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/handler" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" - - "github.com/zeromicro/go-zero/core/conf" - "github.com/zeromicro/go-zero/rest" -) - -var configFile = flag.String("f", "etc/courseteacherapi.yaml", "the config file") - -func main() { - flag.Parse() - - var c config.Config - conf.MustLoad(*configFile, &c) - - server := rest.MustNewServer(c.RestConf) - defer server.Stop() - - ctx := svc.NewServiceContext(c) - handler.RegisterHandlers(server, ctx) - - fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port) - server.Start() -} diff --git a/server/internal/course_teacher/etc/courseteacherapi.yaml b/server/internal/course_teacher/etc/courseteacherapi.yaml deleted file mode 100644 index cca67a9a..00000000 --- a/server/internal/course_teacher/etc/courseteacherapi.yaml +++ /dev/null @@ -1,3 +0,0 @@ -Name: course_teacher_api -Host: 0.0.0.0 -Port: 8888 diff --git a/server/internal/course_teacher/internal/handler/course_teacher/createcourseteacherhandler.go b/server/internal/course_teacher/handler/course_teacher/createcourseteacherhandler.go similarity index 82% rename from server/internal/course_teacher/internal/handler/course_teacher/createcourseteacherhandler.go rename to server/internal/course_teacher/handler/course_teacher/createcourseteacherhandler.go index 803575a5..2358b643 100644 --- a/server/internal/course_teacher/internal/handler/course_teacher/createcourseteacherhandler.go +++ b/server/internal/course_teacher/handler/course_teacher/createcourseteacherhandler.go @@ -6,13 +6,13 @@ package course_teacher import ( "net/http" + "github.com/JACKYMYPERSON/hldrCenter/config" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/logic/course_teacher" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/types" "github.com/zeromicro/go-zero/rest/httpx" ) -func CreateCourseTeacherHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { +func CreateCourseTeacherHandler(cfg *config.Config) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req types.CreateCourseTeacherReq if err := httpx.Parse(r, &req); err != nil { diff --git a/server/internal/course_teacher/internal/handler/course_teacher/deletecourseteacherhandler.go b/server/internal/course_teacher/handler/course_teacher/deletecourseteacherhandler.go similarity index 82% rename from server/internal/course_teacher/internal/handler/course_teacher/deletecourseteacherhandler.go rename to server/internal/course_teacher/handler/course_teacher/deletecourseteacherhandler.go index f8e46dc5..89cf4f23 100644 --- a/server/internal/course_teacher/internal/handler/course_teacher/deletecourseteacherhandler.go +++ b/server/internal/course_teacher/handler/course_teacher/deletecourseteacherhandler.go @@ -6,13 +6,13 @@ package course_teacher import ( "net/http" + "github.com/JACKYMYPERSON/hldrCenter/config" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/logic/course_teacher" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/types" "github.com/zeromicro/go-zero/rest/httpx" ) -func DeleteCourseTeacherHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { +func DeleteCourseTeacherHandler(cfg *config.Config) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req types.DeleteCourseTeacherReq if err := httpx.Parse(r, &req); err != nil { diff --git a/server/internal/course_teacher/internal/handler/course_teacher/getcourseteacherhandler.go b/server/internal/course_teacher/handler/course_teacher/getcourseteacherhandler.go similarity index 82% rename from server/internal/course_teacher/internal/handler/course_teacher/getcourseteacherhandler.go rename to server/internal/course_teacher/handler/course_teacher/getcourseteacherhandler.go index ddfb8994..7e80bad7 100644 --- a/server/internal/course_teacher/internal/handler/course_teacher/getcourseteacherhandler.go +++ b/server/internal/course_teacher/handler/course_teacher/getcourseteacherhandler.go @@ -6,13 +6,13 @@ package course_teacher import ( "net/http" + "github.com/JACKYMYPERSON/hldrCenter/config" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/logic/course_teacher" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/types" "github.com/zeromicro/go-zero/rest/httpx" ) -func GetCourseTeacherHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { +func GetCourseTeacherHandler(cfg *config.Config) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req types.GetCourseTeacherReq if err := httpx.Parse(r, &req); err != nil { diff --git a/server/internal/course_teacher/internal/handler/course_teacher/listcourseteacherhandler.go b/server/internal/course_teacher/handler/course_teacher/listcourseteacherhandler.go similarity index 82% rename from server/internal/course_teacher/internal/handler/course_teacher/listcourseteacherhandler.go rename to server/internal/course_teacher/handler/course_teacher/listcourseteacherhandler.go index 76c78a0b..f5fe30c7 100644 --- a/server/internal/course_teacher/internal/handler/course_teacher/listcourseteacherhandler.go +++ b/server/internal/course_teacher/handler/course_teacher/listcourseteacherhandler.go @@ -6,13 +6,13 @@ package course_teacher import ( "net/http" + "github.com/JACKYMYPERSON/hldrCenter/config" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/logic/course_teacher" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/types" "github.com/zeromicro/go-zero/rest/httpx" ) -func ListCourseTeacherHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { +func ListCourseTeacherHandler(cfg *config.Config) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req types.ListCourseTeacherReq if err := httpx.Parse(r, &req); err != nil { diff --git a/server/internal/course_teacher/internal/handler/course_teacher/updatecourseteacherhandler.go b/server/internal/course_teacher/handler/course_teacher/updatecourseteacherhandler.go similarity index 82% rename from server/internal/course_teacher/internal/handler/course_teacher/updatecourseteacherhandler.go rename to server/internal/course_teacher/handler/course_teacher/updatecourseteacherhandler.go index f3f59a73..88b2c290 100644 --- a/server/internal/course_teacher/internal/handler/course_teacher/updatecourseteacherhandler.go +++ b/server/internal/course_teacher/handler/course_teacher/updatecourseteacherhandler.go @@ -6,13 +6,13 @@ package course_teacher import ( "net/http" + "github.com/JACKYMYPERSON/hldrCenter/config" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/logic/course_teacher" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/types" "github.com/zeromicro/go-zero/rest/httpx" ) -func UpdateCourseTeacherHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { +func UpdateCourseTeacherHandler(cfg *config.Config) http.HandlerFunc { return func(w http.ResponseWriter, r *http.Request) { var req types.UpdateCourseTeacherReq if err := httpx.Parse(r, &req); err != nil { diff --git a/server/internal/course_teacher/internal/config/config.go b/server/internal/course_teacher/internal/config/config.go deleted file mode 100644 index 7fbd0898..00000000 --- a/server/internal/course_teacher/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/course_teacher/internal/handler/routes.go b/server/internal/course_teacher/internal/handler/routes.go deleted file mode 100644 index 6573fdc4..00000000 --- a/server/internal/course_teacher/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" - - course_teacher "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/handler/course_teacher" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" - - "github.com/zeromicro/go-zero/rest" -) - -func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { - server.AddRoutes( - []rest.Route{ - { - Method: http.MethodPost, - Path: "/", - Handler: course_teacher.CreateCourseTeacherHandler(serverCtx), - }, - { - Method: http.MethodPut, - Path: "/", - Handler: course_teacher.UpdateCourseTeacherHandler(serverCtx), - }, - { - Method: http.MethodGet, - Path: "/:id", - Handler: course_teacher.GetCourseTeacherHandler(serverCtx), - }, - { - Method: http.MethodDelete, - Path: "/:id", - Handler: course_teacher.DeleteCourseTeacherHandler(serverCtx), - }, - { - Method: http.MethodPost, - Path: "/list", - Handler: course_teacher.ListCourseTeacherHandler(serverCtx), - }, - }, - rest.WithPrefix("/api/course-teacher"), - ) -} diff --git a/server/internal/course_teacher/internal/logic/course_teacher/createcourseteacherlogic.go b/server/internal/course_teacher/internal/logic/course_teacher/createcourseteacherlogic.go index 31880fbf..1d101a4c 100644 --- a/server/internal/course_teacher/internal/logic/course_teacher/createcourseteacherlogic.go +++ b/server/internal/course_teacher/internal/logic/course_teacher/createcourseteacherlogic.go @@ -6,7 +6,8 @@ package course_teacher import ( "context" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" + "github.com/JACKYMYPERSON/hldrCenter/config" + "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/model" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/types" "github.com/zeromicro/go-zero/core/logx" @@ -14,15 +15,17 @@ import ( type CreateCourseTeacherLogic struct { logx.Logger - ctx context.Context - svcCtx *svc.ServiceContext + ctx context.Context + cfg *config.Config + model model.CourseTeacherModel } -func NewCreateCourseTeacherLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateCourseTeacherLogic { +func NewCreateCourseTeacherLogic(ctx context.Context, cfg *config.Config, model model.CourseTeacherModel) *CreateCourseTeacherLogic { return &CreateCourseTeacherLogic{ Logger: logx.WithContext(ctx), ctx: ctx, - svcCtx: svcCtx, + cfg: cfg, + model: model, } } diff --git a/server/internal/course_teacher/internal/logic/course_teacher/deletecourseteacherlogic.go b/server/internal/course_teacher/internal/logic/course_teacher/deletecourseteacherlogic.go index dea6765d..940e3501 100644 --- a/server/internal/course_teacher/internal/logic/course_teacher/deletecourseteacherlogic.go +++ b/server/internal/course_teacher/internal/logic/course_teacher/deletecourseteacherlogic.go @@ -6,7 +6,8 @@ package course_teacher import ( "context" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" + "github.com/JACKYMYPERSON/hldrCenter/config" + "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/model" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/types" "github.com/zeromicro/go-zero/core/logx" @@ -14,15 +15,17 @@ import ( type DeleteCourseTeacherLogic struct { logx.Logger - ctx context.Context - svcCtx *svc.ServiceContext + ctx context.Context + cfg *config.Config + model model.CourseTeacherModel } -func NewDeleteCourseTeacherLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteCourseTeacherLogic { +func NewDeleteCourseTeacherLogic(ctx context.Context, cfg *config.Config, model model.CourseTeacherModel) *DeleteCourseTeacherLogic { return &DeleteCourseTeacherLogic{ Logger: logx.WithContext(ctx), ctx: ctx, - svcCtx: svcCtx, + cfg: cfg, + model: model, } } diff --git a/server/internal/course_teacher/internal/logic/course_teacher/getcourseteacherlogic.go b/server/internal/course_teacher/internal/logic/course_teacher/getcourseteacherlogic.go index cf03d677..f6d05ec4 100644 --- a/server/internal/course_teacher/internal/logic/course_teacher/getcourseteacherlogic.go +++ b/server/internal/course_teacher/internal/logic/course_teacher/getcourseteacherlogic.go @@ -6,7 +6,8 @@ package course_teacher import ( "context" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" + "github.com/JACKYMYPERSON/hldrCenter/config" + "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/model" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/types" "github.com/zeromicro/go-zero/core/logx" @@ -14,15 +15,17 @@ import ( type GetCourseTeacherLogic struct { logx.Logger - ctx context.Context - svcCtx *svc.ServiceContext + ctx context.Context + cfg *config.Config + model model.CourseTeacherModel } -func NewGetCourseTeacherLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetCourseTeacherLogic { +func NewGetCourseTeacherLogic(ctx context.Context, cfg *config.Config, model model.CourseTeacherModel) *GetCourseTeacherLogic { return &GetCourseTeacherLogic{ Logger: logx.WithContext(ctx), ctx: ctx, - svcCtx: svcCtx, + cfg: cfg, + model: model, } } diff --git a/server/internal/course_teacher/internal/logic/course_teacher/listcourseteacherlogic.go b/server/internal/course_teacher/internal/logic/course_teacher/listcourseteacherlogic.go index 0056d143..21fe19c9 100644 --- a/server/internal/course_teacher/internal/logic/course_teacher/listcourseteacherlogic.go +++ b/server/internal/course_teacher/internal/logic/course_teacher/listcourseteacherlogic.go @@ -6,7 +6,8 @@ package course_teacher import ( "context" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" + "github.com/JACKYMYPERSON/hldrCenter/config" + "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/model" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/types" "github.com/zeromicro/go-zero/core/logx" @@ -14,15 +15,17 @@ import ( type ListCourseTeacherLogic struct { logx.Logger - ctx context.Context - svcCtx *svc.ServiceContext + ctx context.Context + cfg *config.Config + model model.CourseTeacherModel } -func NewListCourseTeacherLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ListCourseTeacherLogic { +func NewListCourseTeacherLogic(ctx context.Context, cfg *config.Config, model model.CourseTeacherModel) *ListCourseTeacherLogic { return &ListCourseTeacherLogic{ Logger: logx.WithContext(ctx), ctx: ctx, - svcCtx: svcCtx, + cfg: cfg, + model: model, } } diff --git a/server/internal/course_teacher/internal/logic/course_teacher/updatecourseteacherlogic.go b/server/internal/course_teacher/internal/logic/course_teacher/updatecourseteacherlogic.go index 7da1ef32..787f2ed3 100644 --- a/server/internal/course_teacher/internal/logic/course_teacher/updatecourseteacherlogic.go +++ b/server/internal/course_teacher/internal/logic/course_teacher/updatecourseteacherlogic.go @@ -6,7 +6,8 @@ package course_teacher import ( "context" - "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/svc" + "github.com/JACKYMYPERSON/hldrCenter/config" + "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/model" "github.com/JACKYMYPERSON/hldrCenter/internal/course_teacher/internal/types" "github.com/zeromicro/go-zero/core/logx" @@ -14,15 +15,17 @@ import ( type UpdateCourseTeacherLogic struct { logx.Logger - ctx context.Context - svcCtx *svc.ServiceContext + ctx context.Context + cfg *config.Config + model model.CourseTeacherModel } -func NewUpdateCourseTeacherLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateCourseTeacherLogic { +func NewUpdateCourseTeacherLogic(ctx context.Context, cfg *config.Config, model model.CourseTeacherModel) *UpdateCourseTeacherLogic { return &UpdateCourseTeacherLogic{ Logger: logx.WithContext(ctx), ctx: ctx, - svcCtx: svcCtx, + cfg: cfg, + model: model, } } diff --git a/server/internal/course_teacher/internal/svc/servicecontext.go b/server/internal/course_teacher/internal/svc/servicecontext.go deleted file mode 100644 index 689c5f88..00000000 --- a/server/internal/course_teacher/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/course_teacher/internal/config" -) - -type ServiceContext struct { - Config config.Config -} - -func NewServiceContext(c config.Config) *ServiceContext { - return &ServiceContext{ - Config: c, - } -}