[feat] 命名优化

This commit is contained in:
2023-06-05 16:52:03 +08:00
parent 73c755524a
commit b2a2d70f66
5 changed files with 100 additions and 84 deletions
+3 -42
View File
@@ -4,7 +4,6 @@ import (
"net/http"
"github.com/samber/do"
"google.golang.org/grpc"
)
type Controller interface {
@@ -13,18 +12,6 @@ type Controller interface {
Dispatch(job string, payload any, u User) error
}
type GRpController interface {
Controller
// 获取 gRPC 服务的描述信息
GetGRpcServiceDesc() *grpc.ServiceDesc
}
type JobController interface {
Controller
// 任务处理
Handle(any) error
}
type HttpController interface {
Controller
// 获取用户信息
@@ -37,6 +24,8 @@ type HttpController interface {
Route() Route
// 内部调用
Call(code string, params map[string]any, category ...RouteCategory) (HttpResponse, error)
// 内部调用
// Invoke()
}
type WsController interface {
@@ -55,14 +44,6 @@ type BaseController struct {
container *do.Injector
}
type GRpcBaseController struct {
Controller
}
type JobBaseController struct {
Controller
}
type HttpBaseController struct {
Controller
request *http.Request
@@ -81,7 +62,7 @@ func (this BaseController) Container() *do.Injector {
}
func (this BaseController) Dispatch(job string, payload any, u User) error {
return do.MustInvoke[Job](this.Container()).Dispatch(job, payload, u)
return do.MustInvoke[JobService](this.Container()).Dispatch(job, payload, u)
}
func (this HttpBaseController) Request() *http.Request {
@@ -121,14 +102,6 @@ func (WsBaseController) WsClientGroup(GlobalParams) WsClientGroup {
return defaultWsClientGroup
}
func (JobBaseController) Handle(any) error {
return nil
}
func (GRpcBaseController) GetGRpcServiceDesc() *grpc.ServiceDesc {
return nil
}
func NewBaseController(container *do.Injector) Controller {
return &BaseController{container}
}
@@ -146,15 +119,3 @@ func NewWsBaseController(ws WsClient, ctr HttpController) WsController {
ws: ws,
}
}
func NewGRpBaseController(container *do.Injector) JobController {
return &JobBaseController{
Controller: &BaseController{container},
}
}
func NewJobBaseController(container *do.Injector) GRpController {
return &GRpcBaseController{
Controller: &BaseController{container},
}
}