diff --git a/tools/goctl/pkg/parser/api/parser/analyzer.go b/tools/goctl/pkg/parser/api/parser/analyzer.go index cecb0c597..34722ef64 100644 --- a/tools/goctl/pkg/parser/api/parser/analyzer.go +++ b/tools/goctl/pkg/parser/api/parser/analyzer.go @@ -176,11 +176,7 @@ func (a *Analyzer) convertKV(kv []*ast.KVExpr) map[string]string { var ret = map[string]string{} for _, v := range kv { key := strings.TrimSuffix(v.Key.Token.Text, ":") - if key == summaryKeyText { - ret[key] = v.Value.RawText() - } else { - ret[key] = v.Value.Token.Text - } + ret[key] = v.Value.RawText() } return ret diff --git a/tools/goctl/pkg/parser/api/parser/parser.go b/tools/goctl/pkg/parser/api/parser/parser.go index 2328f414b..9faa00026 100644 --- a/tools/goctl/pkg/parser/api/parser/parser.go +++ b/tools/goctl/pkg/parser/api/parser/parser.go @@ -14,8 +14,6 @@ import ( const ( idAPI = "api" - summaryKeyExprText = "summary:" - summaryKeyText = "summary" groupKeyText = "group" infoTitleKey = "Title" infoDescKey = "Desc" @@ -1201,12 +1199,6 @@ func (p *Parser) parseAtServerKVExpression() *ast.KVExpr { expr.Value = node return expr } else if p.peekTokenIs(token.STRING) { - if expr.Key.Token.Text != summaryKeyExprText { - if p.notExpectPeekToken(token.QUO, token.DURATION, token.IDENT, token.INT) { - return nil - } - } - if !p.nextToken() { return nil } diff --git a/tools/goctl/pkg/parser/api/parser/parser_test.go b/tools/goctl/pkg/parser/api/parser/parser_test.go index 7e4b6524f..361903ee8 100644 --- a/tools/goctl/pkg/parser/api/parser/parser_test.go +++ b/tools/goctl/pkg/parser/api/parser/parser_test.go @@ -305,6 +305,7 @@ func TestParser_Parse_atServerStmt(t *testing.T) { "prefix3:": "v1/v2_", "prefix4:": "a-b-c", "summary:": `"test"`, + "key:": `"bar"`, } p := New("foo.api", atServerTestAPI) diff --git a/tools/goctl/pkg/parser/api/parser/testdata/atserver_test.api b/tools/goctl/pkg/parser/api/parser/testdata/atserver_test.api index 5980510e9..d1d67f06f 100644 --- a/tools/goctl/pkg/parser/api/parser/testdata/atserver_test.api +++ b/tools/goctl/pkg/parser/api/parser/testdata/atserver_test.api @@ -19,4 +19,5 @@ prefix3: v1/v2_ prefix4: a-b-c summary:"test" + key:"bar" ) diff --git a/tools/goctl/pkg/parser/api/parser/testdata/test.api b/tools/goctl/pkg/parser/api/parser/testdata/test.api index d9701074e..ea5017dc6 100644 --- a/tools/goctl/pkg/parser/api/parser/testdata/test.api +++ b/tools/goctl/pkg/parser/api/parser/testdata/test.api @@ -129,6 +129,7 @@ service test { @server ( jwt: Auth group: Group1 + foo:"bar" ) service test { @doc "ping"