mirror of
https://github.com/zeromicro/go-zero.git
synced 2026-05-13 09:50:00 +08:00
remove string restriction on atserver (#4499)
This commit is contained in:
@@ -176,11 +176,7 @@ func (a *Analyzer) convertKV(kv []*ast.KVExpr) map[string]string {
|
|||||||
var ret = map[string]string{}
|
var ret = map[string]string{}
|
||||||
for _, v := range kv {
|
for _, v := range kv {
|
||||||
key := strings.TrimSuffix(v.Key.Token.Text, ":")
|
key := strings.TrimSuffix(v.Key.Token.Text, ":")
|
||||||
if key == summaryKeyText {
|
ret[key] = v.Value.RawText()
|
||||||
ret[key] = v.Value.RawText()
|
|
||||||
} else {
|
|
||||||
ret[key] = v.Value.Token.Text
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ret
|
return ret
|
||||||
|
|||||||
@@ -14,8 +14,6 @@ import (
|
|||||||
|
|
||||||
const (
|
const (
|
||||||
idAPI = "api"
|
idAPI = "api"
|
||||||
summaryKeyExprText = "summary:"
|
|
||||||
summaryKeyText = "summary"
|
|
||||||
groupKeyText = "group"
|
groupKeyText = "group"
|
||||||
infoTitleKey = "Title"
|
infoTitleKey = "Title"
|
||||||
infoDescKey = "Desc"
|
infoDescKey = "Desc"
|
||||||
@@ -1201,12 +1199,6 @@ func (p *Parser) parseAtServerKVExpression() *ast.KVExpr {
|
|||||||
expr.Value = node
|
expr.Value = node
|
||||||
return expr
|
return expr
|
||||||
} else if p.peekTokenIs(token.STRING) {
|
} 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() {
|
if !p.nextToken() {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -305,6 +305,7 @@ func TestParser_Parse_atServerStmt(t *testing.T) {
|
|||||||
"prefix3:": "v1/v2_",
|
"prefix3:": "v1/v2_",
|
||||||
"prefix4:": "a-b-c",
|
"prefix4:": "a-b-c",
|
||||||
"summary:": `"test"`,
|
"summary:": `"test"`,
|
||||||
|
"key:": `"bar"`,
|
||||||
}
|
}
|
||||||
|
|
||||||
p := New("foo.api", atServerTestAPI)
|
p := New("foo.api", atServerTestAPI)
|
||||||
|
|||||||
@@ -19,4 +19,5 @@
|
|||||||
prefix3: v1/v2_
|
prefix3: v1/v2_
|
||||||
prefix4: a-b-c
|
prefix4: a-b-c
|
||||||
summary:"test"
|
summary:"test"
|
||||||
|
key:"bar"
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -129,6 +129,7 @@ service test {
|
|||||||
@server (
|
@server (
|
||||||
jwt: Auth
|
jwt: Auth
|
||||||
group: Group1
|
group: Group1
|
||||||
|
foo:"bar"
|
||||||
)
|
)
|
||||||
service test {
|
service test {
|
||||||
@doc "ping"
|
@doc "ping"
|
||||||
|
|||||||
Reference in New Issue
Block a user