添加base path

Author: yumaojun03

http/router/httprouter/subrouter.go

@@ -76,7 +76,7 @@ func (r *subRouter) SetLabel(labels ...*router.Label) {
 	r.labels = append(r.labels, labels...)
 }
 
-func (r *subRouter) ResourceRouter(resourceName string, labels ...*router.Label) router.SubRouter {
+func (r *subRouter) ResourceRouter(resourceName string, labels ...*router.Label) router.ResourceRouter {
 	return &subRouter{
 		resourceName: resourceName,
 		basePath:     r.basePath,
@@ -85,6 +85,10 @@ func (r *subRouter) ResourceRouter(resourceName string, labels ...*router.Label)
 	}
 }
 
+func (r *subRouter) BasePath(path string) {
+	r.basePath += "/" + path
+}
+
 func (r *subRouter) add(e *entry) {
 	// 子路由全局标签
 	for i := range r.labels {

http/router/httprouter/subrouter_test.go

@@ -56,10 +56,7 @@ func (a *subRouterTestSuit) testAddPublictOK() func(t *testing.T) {
 	return func(t *testing.T) {
 		a.sub.AddPublict("GET", "/", IndexHandler)
 
-		t.Log(a.root.GetEndpoints())
-
 		w := httptest.NewRecorder()
-
 		req, _ := http.NewRequest("GET", "/v1/", nil)
 		a.root.ServeHTTP(w, req)
 
@@ -69,13 +66,15 @@ func (a *subRouterTestSuit) testAddPublictOK() func(t *testing.T) {
 
 func (a *subRouterTestSuit) testResourceRouterOK() func(t *testing.T) {
 	return func(t *testing.T) {
-		a.sub.ResourceRouter("resourceName", router.NewLable("k1", "v1")).AddPublict("GET", "/resources", IndexHandler)
+		rr := a.sub.ResourceRouter("resourceName", router.NewLable("k1", "v1"))
+		rr.BasePath("resources")
+		rr.AddPublict("GET", "/", IndexHandler)
 
 		w := httptest.NewRecorder()
-		req, _ := http.NewRequest("GET", "/v1/resources", nil)
+		req, _ := http.NewRequest("GET", "/v1/resources/", nil)
 		a.root.ServeHTTP(w, req)
 
-		entry := a.root.GetEndpoints().GetEntry("/v1/resources", "GET")
+		entry := a.root.GetEndpoints().GetEntry("/v1/resources/", "GET")
 		a.should.Equal(w.Code, 200)
 		a.should.Equal(entry.Labels["k1"], "v1")
 	}

http/router/router.go

@@ -49,5 +49,12 @@ type SubRouter interface {
 	SetLabel(...*Label)
 	// ResourceRouter 资源路由器, 主要用于设置路由标签和资源名称,
 	// 方便配置灵活的权限策略
-	ResourceRouter(resourceName string, labels ...*Label) SubRouter
+	ResourceRouter(resourceName string, labels ...*Label) ResourceRouter
+}
+
+// ResourceRouter 资源路由
+type ResourceRouter interface {
+	SubRouter
+	// BasePath 设置资源路由的基础路径
+	BasePath(path string)
 }