lbsadmin/Beego
1
0
Fork 0
mirror of https://github.com/astaxie/beego.git synced 2024-06-14 16:43:33 +00:00
Code Issues Releases Activity

Merge pull request #3583 from maxshine/develop

Browse Source 
[Fix] Fix the issue that genRouterCode results in @Import annotations getting overwritten
This commit is contained in:
astaxie 2019-03-26 19:13:44 +08:00 committed by GitHub
commit f294121ab7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
parser.go
View File

@ -459,13 +459,17 @@ func genRouterCode(pkgRealpath string) {
imports := "" imports := ""
if len(c.ImportComments) > 0 { if len(c.ImportComments) > 0 {
for _, i := range c.ImportComments { for _, i := range c.ImportComments {
var s string
if i.ImportAlias != "" { if i.ImportAlias != "" {
imports += fmt.Sprintf(` s = fmt.Sprintf(`
%s "%s"`, i.ImportAlias, i.ImportPath) %s "%s"`, i.ImportAlias, i.ImportPath)
} else { } else {
imports += fmt.Sprintf(` s = fmt.Sprintf(`
"%s"`, i.ImportPath) "%s"`, i.ImportPath)
} }
if !strings.Contains(globalimport, s) {
imports += s
}
} }
} }
@ -490,7 +494,7 @@ func genRouterCode(pkgRealpath string) {
}`, filters) }`, filters)
} }
globalimport = imports globalimport += imports
globalinfo = globalinfo + ` globalinfo = globalinfo + `
beego.GlobalControllerRouter["` + k + `"] = append(beego.GlobalControllerRouter["` + k + `"], beego.GlobalControllerRouter["` + k + `"] = append(beego.GlobalControllerRouter["` + k + `"],