lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-23 01:30:55 +00:00
Code Issues Releases Activity

Merge branch 'develop' into develop

Browse Source
This commit is contained in:
ilylia 2017-08-14 11:12:31 +08:00 committed by GitHub
commit 114d722a8d
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
generate/swaggergen/g_docs.go
View File

@ -52,7 +52,7 @@ var importlist map[string]string
var controllerList map[string]map[string]*swagger.Item //controllername Paths items var controllerList map[string]map[string]*swagger.Item //controllername Paths items
var modelsList map[string]map[string]swagger.Schema var modelsList map[string]map[string]swagger.Schema
var rootapi swagger.Swagger var rootapi swagger.Swagger
var astPkgs map[string]*ast.Package var astPkgs []*ast.Package
// refer to builtin.go // refer to builtin.go
var basicTypes = map[string]string{ var basicTypes = map[string]string{
@ -89,7 +89,7 @@ func init() {
importlist = make(map[string]string) importlist = make(map[string]string)
controllerList = make(map[string]map[string]*swagger.Item) controllerList = make(map[string]map[string]*swagger.Item)
modelsList = make(map[string]map[string]swagger.Schema) modelsList = make(map[string]map[string]swagger.Schema)
astPkgs = map[string]*ast.Package{} astPkgs = make([]*ast.Package, 0)
} }
func ParsePackagesFromDir(dirpath string) { func ParsePackagesFromDir(dirpath string) {
@ -136,8 +136,8 @@ func parsePackageFromDir(path string) error {
return err return err
} }
for k, v := range folderPkgs { for _, v := range folderPkgs {
astPkgs[k] = v astPkgs = append(astPkgs, v)
} }
return nil return nil
@ -860,18 +860,20 @@ func getModel(str string) (objectname string, m swagger.Schema, realTypes []stri
packageName := "" packageName := ""
m.Type = "object" m.Type = "object"
for _, pkg := range astPkgs { for _, pkg := range astPkgs {
for _, fl := range pkg.Files { if strs[0] == pkg.Name {
for k, d := range fl.Scope.Objects { for _, fl := range pkg.Files {
if d.Kind == ast.Typ { for k, d := range fl.Scope.Objects {
if k != objectname { if d.Kind == ast.Typ {
continue if k != objectname {
continue
}
// check package
if len(strs) > 1 && pkg.Name != strs[len(strs)-2] {
continue
}
packageName = pkg.Name
parseObject(d, k, &m, &realTypes, astPkgs, pkg.Name)
} }
// check package
if len(strs) > 1 && pkg.Name != strs[len(strs)-2] {
continue
}
packageName = pkg.Name
parseObject(d, k, &m, &realTypes, astPkgs, pkg.Name)
} }
} }
} }
@ -889,7 +891,7 @@ func getModel(str string) (objectname string, m swagger.Schema, realTypes []stri
return return
} }
func parseObject(d *ast.Object, k string, m *swagger.Schema, realTypes *[]string, astPkgs map[string]*ast.Package, packageName string) { func parseObject(d *ast.Object, k string, m *swagger.Schema, realTypes *[]string, astPkgs []*ast.Package, packageName string) {
ts, ok := d.Decl.(*ast.TypeSpec) ts, ok := d.Decl.(*ast.TypeSpec)
if !ok { if !ok {
beeLogger.Log.Fatalf("Unknown type without TypeSec: %v\n", d) beeLogger.Log.Fatalf("Unknown type without TypeSec: %v\n", d)