mirror of
https://github.com/astaxie/beego.git
synced 2025-07-16 02:32:17 +00:00
Merge branch 'astaxie/develop' into develop
# Conflicts: # parser.go
This commit is contained in:
@@ -28,6 +28,7 @@ import (
|
||||
"sort"
|
||||
"strings"
|
||||
|
||||
"github.com/astaxie/beego/logs"
|
||||
"github.com/astaxie/beego/utils"
|
||||
)
|
||||
|
||||
@@ -59,7 +60,7 @@ func parserPkg(pkgRealpath, pkgpath string) error {
|
||||
rep := strings.NewReplacer("\\", "_", "/", "_", ".", "_")
|
||||
commentFilename = coomentPrefix + rep.Replace(strings.Replace(pkgRealpath, AppPath, "", -1)) + ".go"
|
||||
if !compareFile(pkgRealpath) {
|
||||
Info(pkgRealpath + " no changed")
|
||||
logs.Info(pkgRealpath + " no changed")
|
||||
return nil
|
||||
}
|
||||
genInfoList = make(map[string][]ControllerComments)
|
||||
@@ -132,7 +133,7 @@ func parserComments(comments *ast.CommentGroup, funcName, controllerName, pkgpat
|
||||
|
||||
func genRouterCode(pkgRealpath string) {
|
||||
os.Mkdir(getRouterDir(pkgRealpath), 0755)
|
||||
Info("generate router from comments")
|
||||
logs.Info("generate router from comments")
|
||||
var (
|
||||
globalinfo string
|
||||
sortKey []string
|
||||
|
Reference in New Issue
Block a user