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

simplify replacement of the base (root) tree

Browse Source
This commit is contained in:
Silviu Capota-Mera 2017-10-07 12:14:28 -04:00 committed by GitHub
parent 5697c6d7cc
commit fd733f76f0
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app.go
View File

@ -225,7 +225,7 @@ func UnregisterFixedRoute(fixedRoute string, method string) *App {
continue continue
} }
if BeeApp.Handlers.routers[m].prefix == strings.Trim(fixedRoute, "/ ") { if BeeApp.Handlers.routers[m].prefix == strings.Trim(fixedRoute, "/ ") {
delete(BeeApp.Handlers.routers, m) findAndRemoveSingleTree(BeeApp.Handlers.routers[m])
return BeeApp return BeeApp
} }
findAndRemoveTree(subPaths, BeeApp.Handlers.routers[m], m) findAndRemoveTree(subPaths, BeeApp.Handlers.routers[m], m)
@ -236,7 +236,7 @@ func UnregisterFixedRoute(fixedRoute string, method string) *App {
um := strings.ToUpper(method) um := strings.ToUpper(method)
if _, ok := BeeApp.Handlers.routers[um]; ok { if _, ok := BeeApp.Handlers.routers[um]; ok {
if BeeApp.Handlers.routers[um].prefix == strings.Trim(fixedRoute, "/ ") { if BeeApp.Handlers.routers[um].prefix == strings.Trim(fixedRoute, "/ ") {
delete(BeeApp.Handlers.routers, um) findAndRemoveSingleTree(BeeApp.Handlers.routers[um])
return BeeApp return BeeApp
} }
findAndRemoveTree(subPaths, BeeApp.Handlers.routers[um], um) findAndRemoveTree(subPaths, BeeApp.Handlers.routers[um], um)
@ -272,6 +272,20 @@ func findAndRemoveTree(paths []string, entryPointTree *Tree, method string) {
} }
} }
func findAndRemoveSingleTree(entryPointTree *Tree) {
if len(entryPointTree.fixrouters) > 0 {
// Remove the *Tree from the fixrouters slice
entryPointTree.fixrouters[0] = nil
entryPointTree.fixrouters = entryPointTree.fixrouters[1:]
}
if len(entryPointTree.leaves) > 0 {
entryPointTree.leaves[0] = nil
entryPointTree.leaves = entryPointTree.leaves[1:]
}
}
// Include will generate router file in the router/xxx.go from the controller's comments // Include will generate router file in the router/xxx.go from the controller's comments
// usage: // usage:
// beego.Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{}) // beego.Include(&BankAccount{}, &OrderController{},&RefundController{},&ReceiptController{})