修复API root的条目的顺序

Author: yumaojun03

http/router/httprouter/entriy.go

@@ -23,6 +23,7 @@ func newEntrySet() *entrySet {
 
 // EntrySet 路由集合
 type entrySet struct {
+	order []string
 	items map[string]*entry
 }
 
@@ -34,6 +35,7 @@ func (s *entrySet) AddEntry(es ...*entry) error {
 			return fmt.Errorf("router entry %s has exist", key)
 		}
 		s.items[key] = e
+		s.order = append(s.order, key)
 	}
 
 	return nil
@@ -42,8 +44,8 @@ func (s *entrySet) AddEntry(es ...*entry) error {
 // ShowEntries 显示理由条目
 func (s *entrySet) EntrieSet() *router.EntrySet {
 	es := router.NewEntrySet()
-	for _, v := range s.items {
-		es.AddEntry(*v.Entry)
+	for _, key := range s.order {
+		es.AddEntry(*s.items[key].Entry)
 	}
 
 	return es

http/router/httprouter/httprouter_test.go

@@ -140,3 +140,25 @@ func TestAPIRootOK(t *testing.T) {
 		should.NotNil(es.GetEntry("/test", "GET"))
 	}
 }
+
+func TestAPIRootOrderOK(t *testing.T) {
+	should := assert.New(t)
+
+	r := httprouter.New()
+
+	req, _ := http.NewRequest("GET", "/", nil)
+	w := httptest.NewRecorder()
+
+	r.AddProtected("GET", "/test1", IndexHandler)
+	r.AddProtected("GET", "/test2", IndexHandler)
+	r.AddProtected("GET", "/test3", IndexHandler)
+	r.EnableAPIRoot()
+	r.ServeHTTP(w, req)
+
+	es := router.NewEntrySet()
+	if should.NoError(response.GetDataFromBody(w.Result().Body, es)) {
+		should.NotNil("/test1", es.Items[0].Path)
+		should.NotNil("/test2", es.Items[1].Path)
+		should.NotNil("/test3", es.Items[2].Path)
+	}
+}