lbsadmin
/
bee
mirror of https://github.com/beego/bee.git
1
0
Fork 0
Code Issues Releases Activity

Delete the environment variable judgment

This commit is contained in:
qiantao 2020-06-18 16:21:43 +08:00
parent ba359957b9
commit d9eb9b56fd
2 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/commands/generate/generate.go
View File

@ -81,15 +81,6 @@ func GenerateCode(cmd *commands.Command, args []string) int {
beeLogger.Log.Fatal("Command is missing")
}
//gps := utils.GetGOPATHs()
//if len(gps) == 0 {
// beeLogger.Log.Fatal("GOPATH environment variable is not set or empty")
//}
//
//gopath := gps[0]
//
//beeLogger.Log.Debugf("GOPATH: %s", utils.FILE(), utils.LINE(), gopath)
gcmd := args[0]
switch gcmd {
case "scaffold":

24
generate/g_appcode.go
View File

@ -948,17 +948,20 @@ func getFileName(tbName string) (filename string) {
}
func getPackagePath(curpath string) (packpath string) {
if os.Getenv(`GO111MODULE`) == `on` {
beeLogger.Log.Infof("GO111MODULE = on,curpath: %s", curpath)
gopath := os.Getenv("GOPATH")
if gopath == "" {
info := "GOPATH environment variable is not set or empty"
gomodpath := filepath.Join(curpath, `go.mod`)
re, err := regexp.Compile(`^module\s+(.+)$`)
if err != nil {
beeLogger.Log.Fatalf("generate regexp error:%s", err)
beeLogger.Log.Error(info)
beeLogger.Log.Fatalf("try `go.mod` generate regexp error:%s", err)
return ""
}
fd, err := os.Open(gomodpath)
if err != nil {
beeLogger.Log.Fatalf("Error while reading 'go.mod',%s", gomodpath)
beeLogger.Log.Error(info)
beeLogger.Log.Fatalf("try `go.mod` Error while reading 'go.mod',%s", gomodpath)
}
reader := bufio.NewReader(fd)
for {
@ -975,17 +978,12 @@ func getPackagePath(curpath string) (packpath string) {
return s[1]
}
}
beeLogger.Log.Fatalf("Error while parse 'go.mod',%s", gomodpath)
return ""
beeLogger.Log.Error(info)
beeLogger.Log.Fatalf("try `go.mod` Error while parse 'go.mod',%s", gomodpath)
} else {
beeLogger.Log.Debugf("GOPATH: %s", utils.FILE(), utils.LINE(), gopath)
}
gopath := os.Getenv("GOPATH")
if gopath == "" {
beeLogger.Log.Fatal("GOPATH environment variable is not set or empty")
}
beeLogger.Log.Debugf("GOPATH: %s", utils.FILE(), utils.LINE(), gopath)
appsrcpath := ""
haspath := false
wgopath := filepath.SplitList(gopath)