diff --git a/cmd/kit/main.go b/cmd/kit/main.go index b556911..5489811 100644 --- a/cmd/kit/main.go +++ b/cmd/kit/main.go @@ -25,8 +25,8 @@ func (u *Kit) Generate(plugin *protogen.Plugin) error { } u.addImports("context") u.addImports("git.diulo.com/mogfee/protoc-gen-kit/middleware") - u.addImports("git.diulo.com/mogfee/protoc-gen-kit/response") - u.addImports("git.diulo.com/mogfee/protoc-gen-kit/xerrors") + u.addImports("git.diulo.com/mogfee/protoc-gen-kit/pkg/response") + u.addImports("git.diulo.com/mogfee/protoc-gen-kit/pkg/xerrors") u.addImports("github.com/gin-gonic/gin") for _, f := range plugin.Files { if len(f.Services) == 0 { diff --git a/example/main.go b/example/main.go index c3e8b98..a35df35 100644 --- a/example/main.go +++ b/example/main.go @@ -29,7 +29,7 @@ func main() { app.GET("/user/:name", func(c *gin.Context) { xjson.PrintData(c.FullPath()) }) - user.RegisterUserHandler(app, &srv, middleware.JWT(""), middleware.Logger("user-server", l), middleware.Validate()) + user.RegisterUserHandler(app, &srv, middleware.Logger("user-server", l), middleware.Validate()) fmt.Println("http://localhost:8888") app.Run("localhost:8888") } diff --git a/pkg/xresponse/xresponse.go b/pkg/response/response.go similarity index 98% rename from pkg/xresponse/xresponse.go rename to pkg/response/response.go index df73a36..5670cdc 100644 --- a/pkg/xresponse/xresponse.go +++ b/pkg/response/response.go @@ -1,4 +1,4 @@ -package xresponse +package response import ( "encoding/json" diff --git a/proto/v1/user.gin.go b/proto/v1/user.gin.go index 1f44f88..fab39c4 100644 --- a/proto/v1/user.gin.go +++ b/proto/v1/user.gin.go @@ -4,7 +4,6 @@ import ( "context" "git.diulo.com/mogfee/protoc-gen-kit/middleware" "git.diulo.com/mogfee/protoc-gen-kit/pkg/xerrors" - "git.diulo.com/mogfee/protoc-gen-kit/pkg/xresponse" "github.com/gin-gonic/gin" ) @@ -15,7 +14,7 @@ func RegisterUserHandler(app *gin.Engine, srv UserServer, m ...middleware.Middle func httpListHandler(srv UserServer, m ...middleware.Middleware) func(c *gin.Context) { return func(c *gin.Context) { var post LoginRequest - resp := xresponse.New(c) + resp := response.New(c) if err := resp.BindQuery(&post); err != nil { resp.Error(err) return @@ -38,7 +37,7 @@ func httpListHandler(srv UserServer, m ...middleware.Middleware) func(c *gin.Con func httpLoginHandler(srv UserServer, m ...middleware.Middleware) func(c *gin.Context) { return func(c *gin.Context) { var post LoginRequest - resp := xresponse.New(c) + resp := response.New(c) if err := resp.BindJSON(&post); err != nil { resp.Error(err) return