From 0429838598b21fc45cf3b66f2c48cbbad507d0ae Mon Sep 17 00:00:00 2001
From: Jason li <changsongliqd@gmail.com>
Date: Mon, 11 Jan 2021 09:56:48 +0800
Subject: [PATCH] refactor code for add beego type router

---
 server/web/router.go | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/server/web/router.go b/server/web/router.go
index 09988bf7..f321a031 100644
--- a/server/web/router.go
+++ b/server/web/router.go
@@ -455,13 +455,18 @@ func (p *ControllerRegister) RouterAny(pattern string, f interface{}) {
 //    }
 //
 //    AddRouterMethod("get","/api/:id", MyController.Ping)
-func (p *ControllerRegister) AddRouterMethod(method, pattern string, f interface{}) {
-	method = strings.ToUpper(method)
-	if method != "*" && !HTTPMETHOD[method] {
-		panic("not support http method: " + method)
+func (p *ControllerRegister) AddRouterMethod(httpMethod, pattern string, f interface{}) {
+	httpMethod = strings.ToUpper(httpMethod)
+	if httpMethod != "*" && !HTTPMETHOD[httpMethod] {
+		panic("not support http method: " + httpMethod)
 	}
 
 	ct, methodName := getReflectTypeAndMethod(f)
+	p.addBeegoTypeRouter(ct, methodName, httpMethod, pattern)
+}
+
+// addBeegoTypeRouter add beego type router
+func (p *ControllerRegister) addBeegoTypeRouter(ct reflect.Type, ctMethod, httpMethod, pattern string) {
 	route := &ControllerInfo{}
 	route.pattern = pattern
 	route.routerType = routerTypeBeego
@@ -469,18 +474,16 @@ func (p *ControllerRegister) AddRouterMethod(method, pattern string, f interface
 	route.controllerType = ct
 
 	methods := make(map[string]string)
-	if method == "*" {
+	if httpMethod == "*" {
 		for val := range HTTPMETHOD {
-			methods[val] = methodName
+			methods[val] = ctMethod
 		}
 	} else {
-		methods[method] = methodName
+		methods[httpMethod] = ctMethod
 	}
 	route.methods = methods
 
-	for method := range methods {
-		p.addToRouter(method, pattern, route)
-	}
+	p.addRouterForMethod(route)
 }
 
 // get reflect controller type and method by controller method expression