From d9eb9b56fd1108f9785604c581506fe03fb9b4fc Mon Sep 17 00:00:00 2001
From: qiantao <qiantao@yy.com>
Date: Thu, 18 Jun 2020 16:21:43 +0800
Subject: [PATCH] Delete the environment variable judgment

---
 cmd/commands/generate/generate.go |  9 ---------
 generate/g_appcode.go             | 24 +++++++++++-------------
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/cmd/commands/generate/generate.go b/cmd/commands/generate/generate.go
index e427e76..d8bee28 100644
--- a/cmd/commands/generate/generate.go
+++ b/cmd/commands/generate/generate.go
@@ -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":
diff --git a/generate/g_appcode.go b/generate/g_appcode.go
index 8489eef..0103f0d 100644
--- a/generate/g_appcode.go
+++ b/generate/g_appcode.go
@@ -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)