mirror of https://github.com/beego/bee.git
Merge fbe243aa68
into cbb523325d
This commit is contained in:
commit
d07ad57416
|
@ -184,6 +184,7 @@ func GenerateDocs(curpath string) {
|
|||
beeLogger.Log.Fatalf("Error while parsing router.go: %s", err)
|
||||
}
|
||||
|
||||
rootapi.BasePath = "/"
|
||||
rootapi.Infos = swagger.Information{}
|
||||
rootapi.SwaggerVersion = "2.0"
|
||||
|
||||
|
@ -299,9 +300,7 @@ func GenerateDocs(curpath string) {
|
|||
continue
|
||||
}
|
||||
version, params := analyseNewNamespace(v)
|
||||
if rootapi.BasePath == "" && version != "" {
|
||||
rootapi.BasePath = version
|
||||
}
|
||||
|
||||
for _, p := range params {
|
||||
switch pp := p.(type) {
|
||||
case *ast.CallExpr:
|
||||
|
@ -312,7 +311,7 @@ func GenerateDocs(curpath string) {
|
|||
switch pp := sp.(type) {
|
||||
case *ast.CallExpr:
|
||||
if pp.Fun.(*ast.SelectorExpr).Sel.String() == "NSInclude" {
|
||||
controllerName = analyseNSInclude(s, pp)
|
||||
controllerName = analyseNSInclude(version+s, pp)
|
||||
if v, ok := controllerComments[controllerName]; ok {
|
||||
rootapi.Tags = append(rootapi.Tags, swagger.Tag{
|
||||
Name: strings.Trim(s, "/"),
|
||||
|
@ -564,7 +563,9 @@ func parserComments(f *ast.FuncDecl, controllerName, pkgpath string) error {
|
|||
HTTPMethod = "GET"
|
||||
}
|
||||
} else if strings.HasPrefix(t, "@Title") {
|
||||
opts.OperationID = controllerName + "." + strings.TrimSpace(t[len("@Title"):])
|
||||
ti := strings.TrimSpace(t[len("@Title"):])
|
||||
opts.OperationID = controllerName + "." + ti
|
||||
opts.Summary = ti // set default value
|
||||
} else if strings.HasPrefix(t, "@Description") {
|
||||
opts.Description = strings.TrimSpace(t[len("@Description"):])
|
||||
} else if strings.HasPrefix(t, "@Summary") {
|
||||
|
|
Loading…
Reference in New Issue