From 1e4e5a02b27816a420586ac7f603c0582ac7a8e5 Mon Sep 17 00:00:00 2001
From: kingxt <kingxt4job@gmail.com>
Date: Thu, 4 Mar 2021 17:13:07 +0800
Subject: [PATCH] rename (#543)

---
 tools/goctl/api/parser/parser.go |  8 ++++----
 tools/goctl/api/spec/fn.go       | 15 ++++++++-------
 tools/goctl/api/spec/spec.go     | 16 ++++++++--------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/tools/goctl/api/parser/parser.go b/tools/goctl/api/parser/parser.go
index da1fbb97..7310ed3d 100644
--- a/tools/goctl/api/parser/parser.go
+++ b/tools/goctl/api/parser/parser.go
@@ -219,9 +219,9 @@ func (p parser) fillService() error {
 
 		for _, astRoute := range item.ServiceApi.ServiceRoute {
 			route := spec.Route{
-				Annotation: spec.Annotation{},
-				Method:     astRoute.Route.Method.Text(),
-				Path:       astRoute.Route.Path.Text(),
+				AtServerAnnotation: spec.Annotation{},
+				Method:             astRoute.Route.Method.Text(),
+				Path:               astRoute.Route.Path.Text(),
 			}
 			if astRoute.AtHandler != nil {
 				route.Handler = astRoute.AtHandler.Name.Text()
@@ -275,7 +275,7 @@ func (p parser) fillRouteAtServer(astRoute *ast.ServiceRoute, route *spec.Route)
 		for _, kv := range astRoute.AtServer.Kv {
 			properties[kv.Key.Text()] = kv.Value.Text()
 		}
-		route.Annotation.Properties = properties
+		route.AtServerAnnotation.Properties = properties
 		if len(route.Handler) == 0 {
 			route.Handler = properties["handler"]
 		}
diff --git a/tools/goctl/api/spec/fn.go b/tools/goctl/api/spec/fn.go
index 5c0c9c0c..ef533178 100644
--- a/tools/goctl/api/spec/fn.go
+++ b/tools/goctl/api/spec/fn.go
@@ -11,10 +11,11 @@ import (
 const (
 	bodyTagKey        = "json"
 	formTagKey        = "form"
+	pathTagKey        = "path"
 	defaultSummaryKey = "summary"
 )
 
-var definedKeys = []string{bodyTagKey, formTagKey, "path"}
+var definedKeys = []string{bodyTagKey, formTagKey, pathTagKey}
 
 // Routes returns all routes in api service
 func (s Service) Routes() []Route {
@@ -25,7 +26,7 @@ func (s Service) Routes() []Route {
 	return result
 }
 
-// Tags retuens all tags in Member
+// Tags returns all tags in Member
 func (m Member) Tags() []*Tag {
 	tags, err := Parse(m.Tag)
 	if err != nil {
@@ -141,7 +142,7 @@ func (t DefineStruct) GetFormMembers() []Member {
 	return result
 }
 
-// GetNonBodyMembers retruns all have no tag fields
+// GetNonBodyMembers returns all have no tag fields
 func (t DefineStruct) GetNonBodyMembers() []Member {
 	var result []Member
 	for _, member := range t.Members {
@@ -162,16 +163,16 @@ func (r Route) JoinedDoc() string {
 	return strings.TrimSpace(doc)
 }
 
-// GetAnnotation returns the value by specified key
+// GetAnnotation returns the value by specified key from @server
 func (r Route) GetAnnotation(key string) string {
-	if r.Annotation.Properties == nil {
+	if r.AtServerAnnotation.Properties == nil {
 		return ""
 	}
 
-	return r.Annotation.Properties[key]
+	return r.AtServerAnnotation.Properties[key]
 }
 
-// GetAnnotation returns the value by specified key
+// GetAnnotation returns the value by specified key from @server
 func (g Group) GetAnnotation(key string) string {
 	if g.Annotation.Properties == nil {
 		return ""
diff --git a/tools/goctl/api/spec/spec.go b/tools/goctl/api/spec/spec.go
index 50955074..b1c8d01a 100644
--- a/tools/goctl/api/spec/spec.go
+++ b/tools/goctl/api/spec/spec.go
@@ -63,14 +63,14 @@ type (
 
 	// Route describes api route
 	Route struct {
-		Annotation   Annotation
-		Method       string
-		Path         string
-		RequestType  Type
-		ResponseType Type
-		Docs         Doc
-		Handler      string
-		AtDoc        AtDoc
+		AtServerAnnotation Annotation
+		Method             string
+		Path               string
+		RequestType        Type
+		ResponseType       Type
+		Docs               Doc
+		Handler            string
+		AtDoc              AtDoc
 	}
 
 	// Service describes api service