mirror of
https://github.com/labstack/echo.git
synced 2025-09-16 09:16:29 +02:00
@@ -12,3 +12,6 @@ script:
|
|||||||
- go test -coverprofile=middleware.coverprofile ./middleware
|
- go test -coverprofile=middleware.coverprofile ./middleware
|
||||||
- $HOME/gopath/bin/gover
|
- $HOME/gopath/bin/gover
|
||||||
- $HOME/gopath/bin/goveralls -coverprofile=gover.coverprofile -service=travis-ci
|
- $HOME/gopath/bin/goveralls -coverprofile=gover.coverprofile -service=travis-ci
|
||||||
|
matrix:
|
||||||
|
allow_failures:
|
||||||
|
- go: tip
|
||||||
|
3
echo.go
3
echo.go
@@ -349,9 +349,6 @@ func (e *Echo) Match(methods []string, path string, handler Handler, middleware
|
|||||||
|
|
||||||
func (e *Echo) add(method, path string, handler Handler, middleware ...Middleware) {
|
func (e *Echo) add(method, path string, handler Handler, middleware ...Middleware) {
|
||||||
name := handlerName(handler)
|
name := handlerName(handler)
|
||||||
// middleware = append(e.middleware, middleware...)
|
|
||||||
// e.router.Add(method, path, handler, e)
|
|
||||||
|
|
||||||
e.router.Add(method, path, HandlerFunc(func(c Context) error {
|
e.router.Add(method, path, HandlerFunc(func(c Context) error {
|
||||||
for _, m := range middleware {
|
for _, m := range middleware {
|
||||||
handler = m.Handle(handler)
|
handler = m.Handle(handler)
|
||||||
|
60
group.go
60
group.go
@@ -12,54 +12,68 @@ func (g *Group) Use(m ...Middleware) {
|
|||||||
g.middleware = append(g.middleware, m...)
|
g.middleware = append(g.middleware, m...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) Connect(path string, h Handler) {
|
func (g *Group) Connect(path string, h Handler, m ...Middleware) {
|
||||||
g.add(CONNECT, path, h)
|
g.add(CONNECT, path, h, m...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) Delete(path string, h Handler) {
|
func (g *Group) Delete(path string, h Handler, m ...Middleware) {
|
||||||
g.add(DELETE, path, h)
|
g.add(DELETE, path, h, m...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) Get(path string, h Handler) {
|
func (g *Group) Get(path string, h Handler, m ...Middleware) {
|
||||||
g.add(GET, path, h)
|
g.add(GET, path, h, m...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) Head(path string, h Handler) {
|
func (g *Group) Head(path string, h Handler, m ...Middleware) {
|
||||||
g.add(HEAD, path, h)
|
g.add(HEAD, path, h, m...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) Options(path string, h Handler) {
|
func (g *Group) Options(path string, h Handler, m ...Middleware) {
|
||||||
g.add(OPTIONS, path, h)
|
g.add(OPTIONS, path, h, m...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) Patch(path string, h Handler) {
|
func (g *Group) Patch(path string, h Handler, m ...Middleware) {
|
||||||
g.add(PATCH, path, h)
|
g.add(PATCH, path, h, m...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) Post(path string, h Handler) {
|
func (g *Group) Post(path string, h Handler, m ...Middleware) {
|
||||||
g.add(POST, path, h)
|
g.add(POST, path, h, m...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) Put(path string, h Handler) {
|
func (g *Group) Put(path string, h Handler, m ...Middleware) {
|
||||||
g.add(PUT, path, h)
|
g.add(PUT, path, h, m...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) Trace(path string, h Handler) {
|
func (g *Group) Trace(path string, h Handler, m ...Middleware) {
|
||||||
g.add(TRACE, path, h)
|
g.add(TRACE, path, h, m...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *Group) Any(path string, handler Handler, middleware ...Middleware) {
|
||||||
|
for _, m := range methods {
|
||||||
|
g.add(m, path, handler, middleware...)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (g *Group) Match(methods []string, path string, handler Handler, middleware ...Middleware) {
|
||||||
|
for _, m := range methods {
|
||||||
|
g.add(m, path, handler, middleware...)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) Group(prefix string, m ...Middleware) *Group {
|
func (g *Group) Group(prefix string, m ...Middleware) *Group {
|
||||||
return g.echo.Group(prefix, m...)
|
return g.echo.Group(prefix, m...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Group) add(method, path string, h Handler) {
|
func (g *Group) add(method, path string, handler Handler, middleware ...Middleware) {
|
||||||
path = g.prefix + path
|
path = g.prefix + path
|
||||||
name := handlerName(h)
|
name := handlerName(handler)
|
||||||
|
middleware = append(g.middleware, middleware...)
|
||||||
|
|
||||||
g.echo.router.Add(method, path, HandlerFunc(func(c Context) error {
|
g.echo.router.Add(method, path, HandlerFunc(func(c Context) error {
|
||||||
for i := len(g.middleware) - 1; i >= 0; i-- {
|
for _, m := range middleware {
|
||||||
h = g.middleware[i].Handle(h)
|
handler = m.Handle(handler)
|
||||||
}
|
}
|
||||||
return h.Handle(c)
|
return handler.Handle(c)
|
||||||
}), g.echo)
|
}), g.echo)
|
||||||
r := Route{
|
r := Route{
|
||||||
Method: method,
|
Method: method,
|
||||||
|
Reference in New Issue
Block a user