Merge pull request #824 from flycash/develop

fix Beego#4972: bee version failed

cmd/commands/version/banner.go

@@ -15,15 +15,15 @@ import (
 
 // RuntimeInfo holds information about the current runtime.
 type RuntimeInfo struct {
-	GoVersion    string
+	GoVersion  string
-	GOOS         string
+	GOOS       string
-	GOARCH       string
+	GOARCH     string
-	NumCPU       int
+	NumCPU     int
-	GOPATH       string
+	GOPATH     string
-	GOROOT       string
+	GOROOT     string
-	Compiler     string
+	Compiler   string
-	BeeVersion   string
+	BeeVersion string
-	Published    string
+	Published  string
 }
 
 // InitBanner loads the banner and prints it to output
@@ -52,7 +52,7 @@ func show(out io.Writer, content string) {
 	}
 
 	err = t.Execute(out, RuntimeInfo{
-		GetGoVersion(),
+		runtime.Version(),
 		runtime.GOOS,
 		runtime.GOARCH,
 		runtime.NumCPU(),

cmd/commands/version/version.go

@@ -5,18 +5,14 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	"os"
-	"os/exec"
-	"runtime"
-	"strings"
-
 	"gopkg.in/yaml.v2"
+	"os"
+	"runtime"
 
 	"github.com/beego/bee/v2/cmd/commands"
 	"github.com/beego/bee/v2/config"
 	beeLogger "github.com/beego/bee/v2/logger"
 	"github.com/beego/bee/v2/logger/colors"
-	"github.com/beego/bee/v2/utils"
 )
 
 const verboseVersionBanner string = `%s%s______
@@ -33,7 +29,7 @@ const verboseVersionBanner string = `%s%s______
 ├── GOPATH    : {{ .GOPATH }}
 ├── GOROOT    : {{ .GOROOT }}
 ├── Compiler  : {{ .Compiler }}
-└── Published : {{ .Published }}%s
+└── Date      : {{ Now "Monday, 2 Jan 2006" }}%s
 `
 
 const shortVersionBanner = `______
@@ -70,15 +66,14 @@ func versionCmd(cmd *commands.Command, args []string) int {
 
 	if outputFormat != "" {
 		runtimeInfo := RuntimeInfo{
-			GetGoVersion(),
+			GoVersion:  runtime.Version(),
-			runtime.GOOS,
+			GOOS:       runtime.GOOS,
-			runtime.GOARCH,
+			GOARCH:     runtime.GOARCH,
-			runtime.NumCPU(),
+			NumCPU:     runtime.NumCPU(),
-			os.Getenv("GOPATH"),
+			GOPATH:     os.Getenv("GOPATH"),
-			runtime.GOROOT(),
+			GOROOT:     runtime.GOROOT(),
-			runtime.Compiler,
+			Compiler:   runtime.Compiler,
-			version,
+			BeeVersion: version,
-			utils.GetLastPublishedTime(),
 		}
 		switch outputFormat {
 		case "json":
@@ -113,15 +108,3 @@ func ShowShortVersionBanner() {
 	output := colors.NewColorWriter(os.Stdout)
 	InitBanner(output, bytes.NewBufferString(colors.MagentaBold(shortVersionBanner)))
 }
-
-func GetGoVersion() string {
-	var (
-		cmdOut []byte
-		err    error
-	)
-
-	if cmdOut, err = exec.Command("go", "version").Output(); err != nil {
-		beeLogger.Log.Fatalf("There was an error running 'go version' command: %s", err)
-	}
-	return strings.Split(string(cmdOut), " ")[2]
-}

config/conf.go

@@ -27,7 +27,7 @@ import (
 const confVer = 0
 
 const (
-	Version       = "2.0.2"
+	Version       = "2.0.3"
 	GitRemotePath = "github.com/beego/bee/v2"
 )
 

generate/swaggergen/g_docs.go

@@ -1252,6 +1252,7 @@ func parseStruct(imports []*ast.ImportSpec, st *ast.StructType, k string, m *swa
 					for name, p := range nm.Properties {
 						m.Properties[name] = p
 					}
+					m.Required = append(m.Required, nm.Required...)
 					continue
 				}
 			}