lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2025-07-09 12:20:18 +00:00
Code Issues Releases Activity

beego: router change to method Tree

Browse Source
This commit is contained in:
astaxie
2014-06-09 10:11:37 +08:00
parent e00eab7f49
commit 6c8a7f1382
5 changed files with 179 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
namespace.go
View File

@ -182,7 +182,15 @@ func (n *Namespace) Handler(rootpath string, h http.Handler) *Namespace {
//)
func (n *Namespace) Namespace(ns ...*Namespace) *Namespace {
for _, ni := range ns {
n.handlers.routers.AddTree(ni.prefix, ni.handlers.routers)
for k, v := range ni.handlers.routers {
if t, ok := n.handlers.routers[k]; ok {
n.handlers.routers[k].AddTree(ni.prefix, v)
} else {
t = NewTree()
t.AddTree(ni.prefix, v)
n.handlers.routers[k] = t
}
}
if n.handlers.enableFilter {
for pos, filterList := range ni.handlers.filters {
for _, mr := range filterList {
@ -201,7 +209,15 @@ func (n *Namespace) Namespace(ns ...*Namespace) *Namespace {
// support multi Namespace
func AddNamespace(nl ...*Namespace) {
for _, n := range nl {
BeeApp.Handlers.routers.AddTree(n.prefix, n.handlers.routers)
for k, v := range n.handlers.routers {
if t, ok := BeeApp.Handlers.routers[k]; ok {
BeeApp.Handlers.routers[k].AddTree(n.prefix, v)
} else {
t = NewTree()
t.AddTree(n.prefix, v)
BeeApp.Handlers.routers[k] = t
}
}
if n.handlers.enableFilter {
for pos, filterList := range n.handlers.filters {
for _, mr := range filterList {