lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-11-23 04:30:54 +00:00
Code Issues Releases Activity

Merge pull request #397 from pengfei-xue/devel

Browse Source 
fix routing bug
This commit is contained in:
astaxie 2013-12-19 21:06:54 -08:00
commit 235d2740c7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
router.go
View File

@ -574,9 +574,11 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
n := len(requestPath) n := len(requestPath)
if requestPath == route.pattern { if requestPath == route.pattern {
runrouter = route.controllerType runrouter = route.controllerType
findrouter = true
runMethod = p.getRunMethod(r.Method, context, route) runMethod = p.getRunMethod(r.Method, context, route)
break if runMethod != "" {
findrouter = true
break
}
} }
// pattern /admin url /admin 200 /admin/ 404 // pattern /admin url /admin 200 /admin/ 404
// pattern /admin/ url /admin 301 /admin/ 200 // pattern /admin/ url /admin 301 /admin/ 200
@ -616,10 +618,12 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
r.URL.RawQuery = url.Values(values).Encode() r.URL.RawQuery = url.Values(values).Encode()
} }
runrouter = route.controllerType runrouter = route.controllerType
findrouter = true
context.Input.Params = params context.Input.Params = params
runMethod = p.getRunMethod(r.Method, context, route) runMethod = p.getRunMethod(r.Method, context, route)
break if runMethod != "" {
findrouter = true
break
}
} }
} }
@ -801,9 +805,8 @@ func (p *ControllerRegistor) getRunMethod(method string, context *beecontext.Con
return m return m
} else if m, ok = router.methods["*"]; ok { } else if m, ok = router.methods["*"]; ok {
return m return m
} else {
return strings.Title(method)
} }
return ""
} else { } else {
return strings.Title(method) return strings.Title(method)
} }