diff --git a/internal/cmd/cmd.go b/internal/cmd/cmd.go index 8568148..a34000b 100644 --- a/internal/cmd/cmd.go +++ b/internal/cmd/cmd.go @@ -3,13 +3,13 @@ package cmd import ( "context" "practice_Go/internal/controller/channel" + "practice_Go/internal/controller/clubPage" "practice_Go/internal/controller/live" "practice_Go/internal/controller/reservation" "practice_Go/internal/controller/subscription" "github.com/gogf/gf/v2/frame/g" "github.com/gogf/gf/v2/net/ghttp" - "practice_Go/internal/controller/clubPage" "practice_Go/internal/controller/mainPage" "github.com/gogf/gf/v2/os/gcmd" @@ -40,7 +40,8 @@ var ( Func: func(ctx context.Context, parser *gcmd.Parser) (err error) { s := g.Server() s.Group("/", func(group *ghttp.RouterGroup) { - group.Middleware(ghttp.MiddlewareHandlerResponse) + //group.Middleware(ghttp.MiddlewareHandlerResponse) + group.Middleware(MiddlewareCORS) group.Bind( channel.NewV1(), subscription.NewV1(), @@ -49,19 +50,17 @@ var ( ) }) - s.BindHandler("/*any", func(r *ghttp.Request) { - r.Response.CORSDefault() - }) - // 定义一个路由组,路径为/mainpage s.Group("/mainpage", func(group *ghttp.RouterGroup) { // 添加中间件,用于处理响应 //group.Middleware(ghttp.MiddlewareHandlerResponse) group.Middleware(MiddlewareCORS) // 绑定路由,将mainPage.NewMainPage()绑定到该路由组 - group.Bind( - mainPage.NewMainPage(), - ) + //group.Bind( + // mainPage.NewMainPage(), + //) + group.GET("/get-shows", mainPage.NewMainPage().GetShows) + group.GET("/get-videos", mainPage.NewMainPage().GetVideos) }) // 定义一个路由组,路径为/clubpage @@ -70,9 +69,11 @@ var ( //group.Middleware(ghttp.MiddlewareHandlerResponse) group.Middleware(MiddlewareCORS) // 绑定路由,将mainPage.NewMainPage()绑定到该路由组 - group.Bind( - clubPage.NewClubPage(), - ) + //group.Bind( + // clubPage.NewClubPage(), + //) + group.GET("/get-clubs", clubPage.NewClubPage().GetClub) + group.GET("/get-club-shows", clubPage.NewClubPage().GetClubShows) }) //开启静态资源 diff --git a/main.go b/main.go index e003169..7e495ad 100644 --- a/main.go +++ b/main.go @@ -1,37 +1,16 @@ package main import ( - _ "practice_Go/internal/logic" - _ "practice_Go/internal/packed" + _ "practice_Go/internal/logic" + _ "practice_Go/internal/packed" - "github.com/gogf/gf/v2/os/gctx" + "github.com/gogf/gf/v2/os/gctx" - _ "github.com/gogf/gf/contrib/drivers/mysql/v2" + _ "github.com/gogf/gf/contrib/drivers/mysql/v2" - "practice_Go/internal/cmd" - - "fmt" - "log" - "net/http" - - "github.com/rs/cors" + "practice_Go/internal/cmd" ) func main() { - cmd.Main.Run(gctx.GetInitCtx()) - - mux := http.NewServeMux() - mux.HandleFunc("/mainpage/get-shows", func(w http.ResponseWriter, r *http.Request) { - fmt.Fprintln(w, "Show data") - }) - - // 创建CORS中间件,配置允许的源等信息 - c := cors.New(cors.Options{ - AllowedOrigins: []string{"http://192.168.9.*:5173"}, - AllowedMethods: []string{"GET", "POST", "PUT", "DELETE"}, - AllowedHeaders: []string{"Content-Type, Authorization"}, - }) - handler := c.Handler(mux) - log.Fatal(http.ListenAndServe(":8080", handler)) - -} \ No newline at end of file + cmd.Main.Run(gctx.GetInitCtx()) +}