Merge pull request #687 from guhan121/develop0711

更好的检查go mod 方式;生成的go.mod 忽略Minor version

cmd/commands/api/apiapp.go

@@ -19,7 +19,6 @@ import (
 	"github.com/beego/bee/logger/colors"
 	"os"
 	path "path/filepath"
-	"runtime"
 	"strings"
 
 	"github.com/beego/bee/cmd/commands"
@@ -608,7 +607,7 @@ func createAPI(cmd *commands.Command, args []string) int {
 	os.MkdirAll(appPath, 0755)
 	if module == `true` { //generate first for calc model name
 		fmt.Fprintf(output, "\t%s%screate%s\t %s%s\n", "\x1b[32m", "\x1b[1m", "\x1b[21m", path.Join(appPath, "go.mod"), "\x1b[0m")
-		utils.WriteToFile(path.Join(appPath, "go.mod"), fmt.Sprintf(goMod, packPath, runtime.Version()[2:], beegoVersion.String()))
+		utils.WriteToFile(path.Join(appPath, "go.mod"), fmt.Sprintf(goMod, packPath, utils.GetGoVersionSkipMinor(), beegoVersion.String()))
 	}
 	fmt.Fprintf(output, "\t%s%screate%s\t %s%s\n", "\x1b[32m", "\x1b[1m", "\x1b[21m", appPath, "\x1b[0m")
 	os.Mkdir(path.Join(appPath, "conf"), 0755)

cmd/commands/hprose/hprose.go

@@ -1,11 +1,9 @@
 package hprose
 
 import (
+	"fmt"
 	"github.com/beego/bee/logger/colors"
 	"os"
-	"runtime"
-
-	"fmt"
 	"path"
 	"strings"
 
@@ -113,7 +111,7 @@ func createhprose(cmd *commands.Command, args []string) int {
 	os.MkdirAll(apppath, 0755)
 	if module == `true` { //generate first for calc model name
 		fmt.Fprintf(output, "\t%s%screate%s\t %s%s\n", "\x1b[32m", "\x1b[1m", "\x1b[21m", path.Join(apppath, "go.mod"), "\x1b[0m")
-		utils.WriteToFile(path.Join(apppath, "go.mod"), fmt.Sprintf(goMod, packpath, runtime.Version()[2:], beegoVersion.String()))
+		utils.WriteToFile(path.Join(apppath, "go.mod"), fmt.Sprintf(goMod, packpath, utils.GetGoVersionSkipMinor(), beegoVersion.String()))
 	}
 	fmt.Fprintf(output, "\t%s%screate%s\t %s%s\n", "\x1b[32m", "\x1b[1m", "\x1b[21m", apppath, "\x1b[0m")
 	os.Mkdir(path.Join(apppath, "conf"), 0755)

cmd/commands/new/new.go

@@ -18,7 +18,6 @@ import (
 	"fmt"
 	"os"
 	path "path/filepath"
-	"runtime"
 	"strings"
 
 	"github.com/beego/bee/cmd/commands"
@@ -305,7 +304,7 @@ func CreateApp(cmd *commands.Command, args []string) int {
 	os.MkdirAll(appPath, 0755)
 	if module == `true` {
 		fmt.Fprintf(output, "\t%s%screate%s\t %s%s\n", "\x1b[32m", "\x1b[1m", "\x1b[21m", path.Join(appPath, "go.mod"), "\x1b[0m")
-		utils.WriteToFile(path.Join(appPath, "go.mod"), fmt.Sprintf(goMod, packPath, runtime.Version()[2:], beegoVersion.String()))
+		utils.WriteToFile(path.Join(appPath, "go.mod"), fmt.Sprintf(goMod, packPath, utils.GetGoVersionSkipMinor(), beegoVersion.String()))
 	}
 	fmt.Fprintf(output, "\t%s%screate%s\t %s%s\n", "\x1b[32m", "\x1b[1m", "\x1b[21m", appPath+string(path.Separator), "\x1b[0m")
 	os.Mkdir(path.Join(appPath, "conf"), 0755)

generate/swaggergen/g_docs.go

@@ -435,7 +435,7 @@ func analyseControllerPkg(vendorPath, localName, pkgpath string) {
 
 	pkgRealpath := ""
 
-	if os.Getenv(`GO111MODULE`) == `on` {
+	if bu.IsGOMODULE() {
 		pkgRealpath = filepath.Join(bu.GetBeeWorkPath(), "..", pkgpath)
 	} else {
 		gopaths := bu.GetGOPATHs()

utils/utils.go

@@ -447,3 +447,19 @@ func defaultGOPATH() string {
 	}
 	return ""
 }
+
+func GetGoVersionSkipMinor() string {
+	strArray := strings.Split(runtime.Version()[2:], `.`)
+	return strArray[0] + `.` + strArray[1]
+}
+
+func IsGOMODULE() bool {
+	if combinedOutput, e := exec.Command(`go`, `env`).CombinedOutput(); e != nil {
+		beeLogger.Log.Errorf("i cann't find go.")
+	} else {
+		regex := regexp.MustCompile(`GOMOD="?(.+go.mod)"?`)
+		stringSubmatch := regex.FindStringSubmatch(string(combinedOutput))
+		return len(stringSubmatch) == 2
+	}
+	return false
+}