Merge branch 'develop' into add_more_test_case

pkg/router/route.go

@@ -61,22 +61,22 @@ func (rt *Route) ClearAPI() error {
 
 // PutAPI puts an api into the resource
 func (rt *Route) PutAPI(api router.API) error {
-	lowerCasePath := strings.ToLower(api.URLPattern)
-	node, ok := rt.findNode(lowerCasePath)
+	fullPath := api.URLPattern
+	node, ok := rt.findNode(fullPath)
 	rt.lock.Lock()
 	defer rt.lock.Unlock()
 	if !ok {
-		wildcard := strings.Contains(lowerCasePath, constant.PathParamIdentifier)
+		wildcard := strings.Contains(fullPath, constant.PathParamIdentifier)
 		rn := &Node{
-			fullPath: lowerCasePath,
+			fullPath: fullPath,
 			methods:  map[config.HTTPVerb]*config.Method{api.Method.HTTPVerb: &api.Method},
 			wildcard: wildcard,
 			headers:  api.Headers,
 		}
 		if wildcard {
-			rt.wildcardTree.Put(lowerCasePath, rn)
+			rt.wildcardTree.Put(fullPath, rn)
 		}
-		rt.tree.Put(lowerCasePath, rn)
+		rt.tree.Put(fullPath, rn)
 		return nil
 	}
 	return node.putMethod(api.Method, api.Headers)
@@ -122,10 +122,9 @@ func (rt *Route) FindAPI(fullPath string, httpverb config.HTTPVerb) (*router.API
 
 // DeleteNode delete node by fullPath
 func (rt *Route) DeleteNode(fullPath string) bool {
-	lowerPath := strings.ToLower(fullPath)
 	rt.lock.RLock()
 	defer rt.lock.RUnlock()
-	rt.tree.Remove(lowerPath)
+	rt.tree.Remove(fullPath)
 	return true
 }
 
@@ -141,13 +140,12 @@ func (rt *Route) DeleteAPI(fullPath string, httpverb config.HTTPVerb) bool {
 }
 
 func (rt *Route) findNode(fullPath string) (*Node, bool) {
-	lowerPath := strings.ToLower(fullPath)
 	var n interface{}
 	var found bool
-	if n, found = rt.searchWildcard(lowerPath); !found {
+	if n, found = rt.searchWildcard(fullPath); !found {
 		rt.lock.RLock()
 		defer rt.lock.RUnlock()
-		if n, found = rt.tree.Get(lowerPath); !found {
+		if n, found = rt.tree.Get(fullPath); !found {
 			return nil, false
 		}
 	}

samples/plugins/ratelimit/README.md

@@ -37,7 +37,7 @@ resources:
     - enable: true
       flowRule:
         #the resource's name
-        resource: "test-dubbo"
+        resource: "test-http"
         threshold: 100
         statintervalinms: 1000
 ```

samples/plugins/ratelimit/README_CN.md

@@ -34,7 +34,7 @@ resources:
     - enable: true
       flowRule:
         #the resource's name
-        resource: "test-dubbo"
+        resource: "test-http"
         threshold: 100
         statintervalinms: 1000
 ```