任务三
This commit is contained in:
parent
259f91c549
commit
05e12a2e2a
|
|
@ -1,21 +1,17 @@
|
|||
package server
|
||||
|
||||
import (
|
||||
v1 "kra/api/kratos/admin/v1"
|
||||
"kra/internal/conf"
|
||||
"kra/internal/service"
|
||||
"kra/pkg/validate"
|
||||
|
||||
"github.com/go-kratos/kratos/v2/middleware/recovery"
|
||||
"github.com/go-kratos/kratos/v2/transport/grpc"
|
||||
)
|
||||
|
||||
// NewGRPCServer new a gRPC server.
|
||||
func NewGRPCServer(c *conf.Server, admin *service.AdminService) *grpc.Server {
|
||||
func NewGRPCServer(c *conf.Server) *grpc.Server {
|
||||
var opts = []grpc.ServerOption{
|
||||
grpc.Middleware(
|
||||
recovery.Recovery(),
|
||||
validate.Middleware(),
|
||||
),
|
||||
}
|
||||
if c.Grpc.Network != "" {
|
||||
|
|
@ -28,6 +24,5 @@ func NewGRPCServer(c *conf.Server, admin *service.AdminService) *grpc.Server {
|
|||
opts = append(opts, grpc.Timeout(c.Grpc.Timeout.AsDuration()))
|
||||
}
|
||||
srv := grpc.NewServer(opts...)
|
||||
v1.RegisterAdminServiceServer(srv, admin)
|
||||
return srv
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,25 +1,17 @@
|
|||
package server
|
||||
|
||||
import (
|
||||
v1 "kra/api/kratos/admin/v1"
|
||||
"kra/internal/conf"
|
||||
"kra/internal/service"
|
||||
"kra/pkg/auth"
|
||||
"kra/pkg/validate"
|
||||
|
||||
"github.com/go-kratos/kratos/v2/middleware/recovery"
|
||||
"github.com/go-kratos/kratos/v2/transport/http"
|
||||
)
|
||||
|
||||
// NewHTTPServer new an HTTP server.
|
||||
func NewHTTPServer(c *conf.Server, admin *service.AdminService) *http.Server {
|
||||
func NewHTTPServer(c *conf.Server) *http.Server {
|
||||
var opts = []http.ServerOption{
|
||||
http.Filter(
|
||||
auth.Middleware(),
|
||||
),
|
||||
http.Middleware(
|
||||
recovery.Recovery(),
|
||||
validate.Middleware(),
|
||||
),
|
||||
}
|
||||
if c.Http.Network != "" {
|
||||
|
|
@ -32,6 +24,5 @@ func NewHTTPServer(c *conf.Server, admin *service.AdminService) *http.Server {
|
|||
opts = append(opts, http.Timeout(c.Http.Timeout.AsDuration()))
|
||||
}
|
||||
srv := http.NewServer(opts...)
|
||||
v1.RegisterAdminServiceHTTPServer(srv, admin)
|
||||
return srv
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue