1
0
mirror of https://github.com/labstack/echo.git synced 2024-12-24 20:14:31 +02:00

fixed recipes for static middleware change

Signed-off-by: Vishal Rana <vr@labstack.com>
This commit is contained in:
Vishal Rana 2016-10-22 16:19:21 -07:00
parent 166a24fe23
commit 4760f4cedf
8 changed files with 13 additions and 10 deletions

View File

@ -19,7 +19,11 @@ func (g *Group) Use(middleware ...MiddlewareFunc) {
// Allow requests `/prefix & /prefix/*` to reach the group as they might get
// dropped if router doesn't find a match, making none of the group middleware
// execute.
g.Any("", NotFoundHandler, g.middleware...)
p := ""
if g.prefix == "" {
p = "/"
}
g.Any(p, NotFoundHandler, g.middleware...)
g.Any("/*", NotFoundHandler, g.middleware...)
}

View File

@ -16,7 +16,7 @@ type (
Skipper Skipper
// Prefix to strip from the request URL path.
// Required.
// Optional. Default value "".
Prefix string `json:"root"`
// Root directory from where the static content is served.
@ -48,9 +48,8 @@ var (
// Static returns a Static middleware to serves static content from the provided
// root directory.
func Static(prefix, root string) echo.MiddlewareFunc {
func Static(root string) echo.MiddlewareFunc {
c := DefaultStaticConfig
c.Prefix = prefix
c.Root = root
return StaticWithConfig(c)
}

View File

@ -57,7 +57,7 @@ func main() {
e.Use(middleware.Logger())
e.Use(middleware.Recover())
e.Use(middleware.Static("public"))
e.Use(middleware.Static( "public"))
e.POST("/upload", upload)

View File

@ -51,7 +51,7 @@ func main() {
e.Use(middleware.Logger())
e.Use(middleware.Recover())
e.Use(middleware.Static("public"))
e.Use(middleware.Static( "public"))
e.POST("/upload", upload)

View File

@ -14,7 +14,7 @@ func createMux() *echo.Echo {
e.Use(middleware.Logger())
e.Use(middleware.Gzip())
e.Use(middleware.Static("public"))
e.Use(middleware.Static( "public"))
return e
}

View File

@ -13,7 +13,7 @@ func main() {
e := echo.New()
e.Use(middleware.Logger())
e.Use(middleware.Recover())
e.Use(middleware.Static("public"))
e.Use(middleware.Static( "public"))
// JSONP
e.GET("/jsonp", func(c echo.Context) error {

View File

@ -41,7 +41,7 @@ func main() {
e := echo.New()
e.Use(middleware.Logger())
e.Use(middleware.Recover())
e.Use(middleware.Static("../public"))
e.Use(middleware.Static( "../public"))
e.GET("/ws", hello)
if err := e.Start(":1323"); err != nil {
panic(err)

View File

@ -35,7 +35,7 @@ func main() {
e := echo.New()
e.Use(middleware.Logger())
e.Use(middleware.Recover())
e.Use(middleware.Static("../public"))
e.Use(middleware.Static( "../public"))
e.GET("/ws", hello)
if err := e.Start(":1323"); err != nil {
panic(err)