lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2025-06-13 11:50:39 +00:00
Code Issues Releases Activity

Merge branch 'develop-up' into develop

Browse Source 
# Conflicts:
#	README.md
#	cmd/commands/update/update.go
#	cmd/commands/version/banner.go
This commit is contained in:
王厚伟
2020-12-22 22:17:05 +08:00
parent b8213eba24 639eccfef9
commit adbc0af183
63 changed files with 271 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/commands/version/banner.go
View File

@ -9,8 +9,8 @@ import (
"time"
beeLogger "github.com/beego/bee/logger"
"github.com/beego/bee/utils"
beeLogger "github.com/beego/bee/v2/logger"
"github.com/beego/bee/v2/utils"
)
// RuntimeInfo holds information about the current runtime.

12
cmd/commands/version/version.go
View File

@ -16,11 +16,11 @@ import (
"gopkg.in/yaml.v2"
"github.com/beego/bee/cmd/commands"
"github.com/beego/bee/config"
beeLogger "github.com/beego/bee/logger"
"github.com/beego/bee/logger/colors"
"github.com/beego/bee/utils"
"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______
@ -162,7 +162,7 @@ func GetBeegoVersion() string {
}
}
return "Beego is not installed. Please do consider installing it first: https://github.com/astaxie/beego. " +
return "Beego is not installed. Please do consider installing it first: https://github.com/beego/beego/v2. " +
"If you are using go mod, and you don't install the beego under $GOPATH/src/github.com/astaxie, just ignore this."
}