mirror of
https://github.com/astaxie/beego.git
synced 2024-12-23 03:10:50 +00:00
fix router & tpl tolower
This commit is contained in:
parent
bce35c708a
commit
8674b81b3a
@ -156,7 +156,7 @@ func (c *Controller) RenderBytes() ([]byte, error) {
|
||||
//if the controller has set layout, then first get the tplname's content set the content to the layout
|
||||
if c.Layout != "" {
|
||||
if c.TplNames == "" {
|
||||
c.TplNames = c.ChildName + "/" + c.Ctx.Request.Method + "." + c.TplExt
|
||||
c.TplNames = c.ChildName + "/" + strings.ToLower(c.Ctx.Request.Method) + "." + c.TplExt
|
||||
}
|
||||
if RunMode == "dev" {
|
||||
BuildTemplate(ViewsPath)
|
||||
|
17
router.go
17
router.go
@ -373,14 +373,15 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
|
||||
for _, route := range p.fixrouters {
|
||||
n := len(requestPath)
|
||||
//route like "/"
|
||||
if n == 1 {
|
||||
if requestPath == route.pattern {
|
||||
runrouter = route
|
||||
findrouter = true
|
||||
break
|
||||
} else {
|
||||
continue
|
||||
}
|
||||
//if n == 1 {
|
||||
// else {
|
||||
// continue
|
||||
// }
|
||||
//}
|
||||
if requestPath == route.pattern {
|
||||
runrouter = route
|
||||
findrouter = true
|
||||
break
|
||||
}
|
||||
|
||||
if (requestPath[n-1] != '/' && route.pattern == requestPath) ||
|
||||
|
Loading…
Reference in New Issue
Block a user