Merge branch 'develop-up' into develop

# Conflicts:
#	README.md
#	cmd/commands/update/update.go
#	cmd/commands/version/banner.go

internal/app/module/beegopro/config.go

@@ -3,8 +3,8 @@ package beegopro
 import (
 	"io/ioutil"
 
-	"github.com/beego/bee/internal/pkg/utils"
-	beeLogger "github.com/beego/bee/logger"
+	"github.com/beego/bee/v2/internal/pkg/utils"
+	beeLogger "github.com/beego/bee/v2/logger"
 )
 
 var CompareExcept = []string{"@BeeGenerateTime"}

internal/app/module/beegopro/container.go

@@ -6,10 +6,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/beego/bee/internal/pkg/git"
-	"github.com/beego/bee/internal/pkg/system"
-	beeLogger "github.com/beego/bee/logger"
-	"github.com/beego/bee/utils"
+	"github.com/beego/bee/v2/internal/pkg/git"
+	"github.com/beego/bee/v2/internal/pkg/system"
+	beeLogger "github.com/beego/bee/v2/logger"
+	"github.com/beego/bee/v2/utils"
 	"github.com/davecgh/go-spew/spew"
 	"github.com/pelletier/go-toml"
 	"github.com/spf13/viper"

internal/app/module/beegopro/migration.go

@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	beeLogger "github.com/beego/bee/logger"
-	"github.com/beego/bee/utils"
+	beeLogger "github.com/beego/bee/v2/logger"
+	"github.com/beego/bee/v2/utils"
 )
 
 var SQL utils.DocValue

internal/app/module/beegopro/parser_mysql.go

@@ -4,8 +4,8 @@ import (
 	"database/sql"
 	"fmt"
 
-	"github.com/beego/bee/internal/pkg/utils"
-	beeLogger "github.com/beego/bee/logger"
+	"github.com/beego/bee/v2/internal/pkg/utils"
+	beeLogger "github.com/beego/bee/v2/logger"
 )
 
 type MysqlParser struct {

internal/app/module/beegopro/pongo2.go

@@ -4,7 +4,7 @@ import (
 	"strings"
 	"unicode/utf8"
 
-	"github.com/beego/bee/utils"
+	"github.com/beego/bee/v2/utils"
 	"github.com/flosch/pongo2"
 )
 

internal/app/module/beegopro/render.go

@@ -11,8 +11,8 @@ import (
 	"github.com/flosch/pongo2"
 	"github.com/smartwalle/pongo2render"
 
-	"github.com/beego/bee/internal/pkg/system"
-	beeLogger "github.com/beego/bee/logger"
+	"github.com/beego/bee/v2/internal/pkg/system"
+	beeLogger "github.com/beego/bee/v2/logger"
 )
 
 // render

internal/app/module/beegopro/schema.go

@@ -6,10 +6,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/beego/bee/internal/pkg/command"
-	"github.com/beego/bee/internal/pkg/system"
-	beeLogger "github.com/beego/bee/logger"
-	"github.com/beego/bee/utils"
+	"github.com/beego/bee/v2/internal/pkg/command"
+	"github.com/beego/bee/v2/internal/pkg/system"
+	beeLogger "github.com/beego/bee/v2/logger"
+	"github.com/beego/bee/v2/utils"
 	"github.com/flosch/pongo2"
 	"github.com/smartwalle/pongo2render"
 )

internal/app/module/beegopro/schema_model.go

@@ -3,7 +3,7 @@ package beegopro
 import (
 	"strings"
 
-	"github.com/beego/bee/utils"
+	"github.com/beego/bee/v2/utils"
 )
 
 // parse get the model info

internal/app/module/beegopro/schema_mysql_model.go

@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"errors"
 
-	"github.com/beego/bee/logger"
+	"github.com/beego/bee/v2/logger"
 )
 
 type TableSchema struct {

internal/app/module/beegopro/schema_text_model.go

@@ -1,7 +1,7 @@
 package beegopro
 
 import (
-	beeLogger "github.com/beego/bee/logger"
+	beeLogger "github.com/beego/bee/v2/logger"
 )
 
 type TextModel struct {

internal/app/module/beegopro/util.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/beego/bee/internal/pkg/utils"
-	beeLogger "github.com/beego/bee/logger"
+	"github.com/beego/bee/v2/internal/pkg/utils"
+	beeLogger "github.com/beego/bee/v2/logger"
 )
 
 // write to file