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

Merge pull request #1349 from ElvizLai/patch-4

Browse Source 
Update tree.go
This commit is contained in:
astaxie 2015-09-17 23:01:32 +08:00
commit eac09e6fb6
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tree.go
View File

@ -213,6 +213,11 @@ func (t *Tree) addseg(segments []string, route interface{}, wildcards []string,
} else { } else {
t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards}) t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards})
} }
for i, v := range wildcards {
if v == ":" {
t.leaves = append(t.leaves, &leafInfo{runObject: route, wildcards: wildcards[:i+1]})
}
}
} else { } else {
seg := segments[0] seg := segments[0]
iswild, params, regexpStr := splitSegment(seg) iswild, params, regexpStr := splitSegment(seg)

6
tree_test.go
View File

@ -26,6 +26,12 @@ var routers []testinfo
func init() { func init() {
routers = make([]testinfo, 0) routers = make([]testinfo, 0)
routers = append(routers, testinfo{"/topic/?:auth:int", "/topic", nil})
routers = append(routers, testinfo{"/topic/?:auth:int", "/topic/123", map[string]string{":auth":"123"}})
routers = append(routers, testinfo{"/topic/:id/?:auth", "/topic/1", map[string]string{":id": "1"}})
routers = append(routers, testinfo{"/topic/:id/?:auth", "/topic/1/2", map[string]string{":id": "1",":auth":"2"}})
routers = append(routers, testinfo{"/topic/:id/?:auth:int", "/topic/1", map[string]string{":id": "1"}})
routers = append(routers, testinfo{"/topic/:id/?:auth:int", "/topic/1/123", map[string]string{":id": "1",":auth":"123"}})
routers = append(routers, testinfo{"/:id", "/123", map[string]string{":id": "123"}}) routers = append(routers, testinfo{"/:id", "/123", map[string]string{":id": "123"}})
routers = append(routers, testinfo{"/hello/?:id", "/hello", map[string]string{":id": ""}}) routers = append(routers, testinfo{"/hello/?:id", "/hello", map[string]string{":id": ""}})
routers = append(routers, testinfo{"/", "/", nil}) routers = append(routers, testinfo{"/", "/", nil})