Skip to content

support multi root namespace in router #596

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

support multi root namespace in router #596

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions generate/swaggergen/g_docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,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"

Expand Down Expand Up @@ -279,9 +280,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:
Expand All @@ -292,7 +291,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, "/"),
Expand Down Expand Up @@ -556,7 +555,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") {
Expand Down