[fix]自动生成ctrl等，规范项目结构

api/v1/v1.go → api/login/login.go

@@ -2,15 +2,14 @@
 // Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // =================================================================================
 
-package v1
+package login
 
 import (
 	"context"
 
-	"cris/api/v1/common"
+	"cris/api/login/v1"
 )
 
-type IV1Common interface {
-	Chat(ctx context.Context, req *common.ChatReq) (res *common.ChatRes, err error)
-	Login(ctx context.Context, req *common.LoginReq) (res *common.LoginRes, err error)
+type ILoginV1 interface {
+	Login(ctx context.Context, req *v1.LoginReq) (res *v1.LoginRes, err error)
 }

api/v1/common/login.go → api/login/v1/login.go

@@ -1,4 +1,4 @@
-package common
+package v1
 
 import "github.com/gogf/gf/v2/frame/g"
 

api/v1/common/chat.go → api/websocket/v1/chat.go

@@ -1,4 +1,4 @@
-package common
+package v1
 
 import "github.com/gogf/gf/v2/frame/g"
 

api/websocket/websocket.go

@@ -0,0 +1,15 @@
+// =================================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// =================================================================================
+
+package websocket
+
+import (
+	"context"
+
+	"cris/api/websocket/v1"
+)
+
+type IWebsocketV1 interface {
+	Chat(ctx context.Context, req *v1.ChatReq) (res *v1.ChatRes, err error)
+}

go.mod

@@ -2,7 +2,10 @@ module cris
 
 go 1.18
 
-require github.com/gogf/gf/v2 v2.7.1
+require (
+	github.com/gogf/gf/v2 v2.7.1
+	github.com/gorilla/websocket v1.5.3
+)
 
 require (
 	github.com/BurntSushi/toml v1.3.2 // indirect
@@ -11,7 +14,6 @@ require (
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/logr v1.2.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/grokify/html-strip-tags-go v0.1.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect

go.sum

@@ -15,8 +15,6 @@ github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre
 github.com/gogf/gf/v2 v2.7.1 h1:Ukp7vzwh6VKnivEEx/xiMc61dL1HVZqCCHl//3GBRxc=
 github.com/gogf/gf/v2 v2.7.1/go.mod h1:3oyGjyLHtSSo8kQ57Nj1TPdUNc0e2HS0A2J+KkXoW+I=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/QY=
-github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grokify/html-strip-tags-go v0.1.0 h1:03UrQLjAny8xci+R+qjCce/MYnpNXCtgzltlQbOBae4=

internal/cmd/cmd.go

@@ -6,8 +6,6 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/os/gcmd"
-
-	"cris/internal/controller"
 )
 
 var (
@@ -17,15 +15,13 @@ var (
 		Brief: "start http server",
 		Func: func(ctx context.Context, parser *gcmd.Parser) (err error) {
 			s := g.Server()
-			//测试路由
+			//测试login路由
 			s.Group("/test", func(group *ghttp.RouterGroup) {
 				group.Middleware(ghttp.MiddlewareHandlerResponse)
-				group.Bind(new(controller.LoginController))
 			})
 			//websocket路由
 			s.Group("/websocket", func(group *ghttp.RouterGroup) {
 				group.Middleware(ghttp.MiddlewareHandlerResponse)
-				group.Bind(new(controller.WebsocketController))
 			})
 
 			s.Run()

internal/controller/auth_controller.go

@@ -1,29 +0,0 @@
-package controller
-
-import (
-	"context"
-
-	"cris/api/v1/common"
-	"cris/internal/service"
-
-	"github.com/gogf/gf/v2/frame/g"
-)
-
-type LoginController struct {
-	LoginService *service.LoginService
-}
-
-// 登录处理方法
-func (c *LoginController) Login(ctx context.Context, req *common.LoginReq) (res *common.LoginRes, err error) {
-
-	r := g.RequestFromCtx(ctx)
-	if err := r.Parse(req); err != nil {
-		r.Response.WriteJsonExit(g.Map{"error": err.Error()})
-	}
-
-	// 调用服务层进行逻辑处理
-	res = c.LoginService.Login(req)
-
-	r.Response.WriteJson(res)
-	return
-}

internal/controller/v1/v1.go → internal/controller/login/login.go

@@ -2,4 +2,4 @@
 // This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
-package v1
+package login

internal/controller/v1/v1_new.go → internal/controller/login/login_new.go

@@ -2,14 +2,14 @@
 // This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
 // =================================================================================
 
-package v1
+package login
 
 import (
-	"cris/api/v1"
+	"cris/api/login"
 )
 
-type ControllerCommon struct{}
+type ControllerV1 struct{}
 
-func NewCommon() v1.IV1Common {
-	return &ControllerCommon{}
+func NewV1() login.ILoginV1 {
+	return &ControllerV1{}
 }

internal/controller/v1/v1_common_chat.go → internal/controller/login/login_v1_login.go

@@ -1,4 +1,4 @@
-package v1
+package login
 
 import (
 	"context"
@@ -6,9 +6,9 @@ import (
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 
-	"cris/api/v1/common"
+	"cris/api/login/v1"
 )
 
-func (c *ControllerCommon) Chat(ctx context.Context, req *common.ChatReq) (res *common.ChatRes, err error) {
+func (c *ControllerV1) Login(ctx context.Context, req *v1.LoginReq) (res *v1.LoginRes, err error) {
 	return nil, gerror.NewCode(gcode.CodeNotImplemented)
 }

internal/controller/websocket/websocket.go

@@ -0,0 +1,5 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package websocket

internal/controller/websocket/websocket_new.go

@@ -0,0 +1,15 @@
+// =================================================================================
+// This is auto-generated by GoFrame CLI tool only once. Fill this file as you wish.
+// =================================================================================
+
+package websocket
+
+import (
+	"cris/api/websocket"
+)
+
+type ControllerV1 struct{}
+
+func NewV1() websocket.IWebsocketV1 {
+	return &ControllerV1{}
+}

internal/controller/v1/v1_common_login.go → internal/controller/websocket/websocket_v1_chat.go

@@ -1,4 +1,4 @@
-package v1
+package websocket
 
 import (
 	"context"
@@ -6,9 +6,9 @@ import (
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 
-	"cris/api/v1/common"
+	"cris/api/websocket/v1"
 )
 
-func (c *ControllerCommon) Login(ctx context.Context, req *common.LoginReq) (res *common.LoginRes, err error) {
+func (c *ControllerV1) Chat(ctx context.Context, req *v1.ChatReq) (res *v1.ChatRes, err error) {
 	return nil, gerror.NewCode(gcode.CodeNotImplemented)
 }

internal/controller/websocket_controller.go

@@ -1,24 +0,0 @@
-package controller
-
-import (
-	"context"
-
-	"github.com/gogf/gf/v2/frame/g"
-
-	"cris/api/v1/common"
-	"cris/internal/service"
-)
-
-type WebsocketController struct {
-	WebsocketService *service.WebsocketService
-}
-
-func (c *WebsocketController) Websocket(ctx context.Context, req *common.ChatReq) (res *common.LoginRes, err error) {
-	r := g.RequestFromCtx(ctx)
-	if err := r.Parse(req); err != nil {
-		r.Response.WriteJsonExit(g.Map{"error": err.Error()})
-	}
-
-	c.WebsocketService.WebSocket(r, req)
-	return nil, nil
-}

internal/logic/logic.go

@@ -0,0 +1,10 @@
+// ==========================================================================
+// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
+// ==========================================================================
+
+package logic
+
+import (
+	_ "cris/internal/logic/login"
+	_ "cris/internal/logic/websocket"
+)

internal/service/auth_service.go → internal/logic/login/login_logic.go

@@ -1,15 +1,15 @@
-package service
+package logic
 
 import (
-	"cris/api/v1/common"
+	v1 "cris/api/login/v1"
 )
 
-type LoginService struct{}
+type LoginLogic struct{}
 
-func (s *LoginService) Login(req *common.LoginReq) *common.LoginRes {
+func (s *LoginLogic) Login(req *v1.LoginReq) *v1.LoginRes {
 	// 在这里进行具体的逻辑处理
 
-	return &common.LoginRes{
+	return &v1.LoginRes{
 		Message: "Login successful",
 		Data: map[string]interface{}{
 			"email":    req.Email,

internal/service/websocket_service.go → internal/logic/websocket/websocket_service.go

@@ -1,14 +1,14 @@
-package service
+package logic
 
 import (
 	"log"
 	"net/http"
 	"sync"
 
-	"cris/api/v1/common"
-
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gorilla/websocket"
+
+	v1 "cris/api/websocket/v1"
 )
 
 // 维护 WebSocket 客户端连接池
@@ -18,7 +18,7 @@ var mu sync.Mutex                 //互斥锁
 
 type WebsocketService struct{}
 
-func (s *WebsocketService) WebSocket(r *ghttp.Request, req *common.ChatReq) {
+func (s *WebsocketService) WebSocket(r *ghttp.Request, req *v1.ChatReq) {
 
 	// 升级 HTTP 请求为 WebSocket
 	upgrader := websocket.Upgrader{

internal/service/login.go

@@ -0,0 +1,3 @@
+package service
+
+type ()

internal/service/websocket.go

@@ -0,0 +1,3 @@
+package service
+
+type ()

main.go

@@ -3,6 +3,8 @@ package main
 import (
 	_ "cris/internal/packed"
 
+	_ "cris/internal/logic"
+
 	"github.com/gogf/gf/v2/os/gctx"
 
 	"cris/internal/cmd"