Commit 00020139 authored by Pengfei Xue's avatar Pengfei Xue

fix routing bug

parent 1c434dc6
......@@ -574,9 +574,11 @@ func (p *ControllerRegistor) ServeHTTP(rw http.ResponseWriter, r *http.Request)
n := len(requestPath)
if requestPath == route.pattern {
runrouter = route.controllerType
findrouter = true
runMethod = p.getRunMethod(r.Method, context, route)
break
if runMethod != "" {
findrouter = true
break
}
}
// pattern /admin url /admin 200 /admin/ 404
// 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()
}
runrouter = route.controllerType
findrouter = true
context.Input.Params = params
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
} else if m, ok = router.methods["*"]; ok {
return m
} else {
return strings.Title(method)
}
return ""
} else {
return strings.Title(method)
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment