Fix imports by gci

adapter/controller.go

@@ -19,9 +19,8 @@ import (
 	"net/url"
 
 	"github.com/beego/beego/v2/adapter/session"
-	webContext "github.com/beego/beego/v2/server/web/context"
-
 	"github.com/beego/beego/v2/server/web"
+	webContext "github.com/beego/beego/v2/server/web/context"
 )
 
 var (

adapter/error.go

@@ -18,9 +18,8 @@ import (
 	"net/http"
 
 	"github.com/beego/beego/v2/adapter/context"
-	beecontext "github.com/beego/beego/v2/server/web/context"
-
 	"github.com/beego/beego/v2/server/web"
+	beecontext "github.com/beego/beego/v2/server/web/context"
 )
 
 const (

adapter/log.go

@@ -18,21 +18,19 @@ import (
 	"strings"
 
 	"github.com/beego/beego/v2/core/logs"
-
-	webLog "github.com/beego/beego/v2/core/logs"
 )
 
 // Log levels to control the logging output.
 // Deprecated: use github.com/beego/beego/v2/core/logs instead.
 const (
-	LevelEmergency     = webLog.LevelEmergency
-	LevelAlert         = webLog.LevelAlert
-	LevelCritical      = webLog.LevelCritical
-	LevelError         = webLog.LevelError
-	LevelWarning       = webLog.LevelWarning
-	LevelNotice        = webLog.LevelNotice
-	LevelInformational = webLog.LevelInformational
-	LevelDebug         = webLog.LevelDebug
+	LevelEmergency     = logs.LevelEmergency
+	LevelAlert         = logs.LevelAlert
+	LevelCritical      = logs.LevelCritical
+	LevelError         = logs.LevelError
+	LevelWarning       = logs.LevelWarning
+	LevelNotice        = logs.LevelNotice
+	LevelInformational = logs.LevelInformational
+	LevelDebug         = logs.LevelDebug
 )
 
 // BeeLogger references the used application logger.

adapter/namespace.go

@@ -18,9 +18,8 @@ import (
 	"net/http"
 
 	adtContext "github.com/beego/beego/v2/adapter/context"
-	"github.com/beego/beego/v2/server/web/context"
-
 	"github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/context"
 )
 
 type namespaceCond func(*adtContext.Context) bool

adapter/plugins/cors/cors.go

@@ -37,10 +37,9 @@ package cors
 
 import (
 	beego "github.com/beego/beego/v2/adapter"
+	"github.com/beego/beego/v2/adapter/context"
 	beecontext "github.com/beego/beego/v2/server/web/context"
 	"github.com/beego/beego/v2/server/web/filter/cors"
-
-	"github.com/beego/beego/v2/adapter/context"
 )
 
 // Options represents Access Control options.

adapter/router.go

@@ -19,9 +19,8 @@ import (
 	"time"
 
 	beecontext "github.com/beego/beego/v2/adapter/context"
-	"github.com/beego/beego/v2/server/web/context"
-
 	"github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/context"
 )
 
 // default filter execution points

adapter/session/memcache/sess_memcache.go

@@ -37,7 +37,6 @@ import (
 	"net/http"
 
 	"github.com/beego/beego/v2/adapter/session"
-
 	beemem "github.com/beego/beego/v2/server/web/session/memcache"
 )
 

adapter/session/mysql/sess_mysql.go

@@ -44,11 +44,11 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/beego/beego/v2/adapter/session"
-	"github.com/beego/beego/v2/server/web/session/mysql"
-
 	// import mysql driver
 	_ "github.com/go-sql-driver/mysql"
+
+	"github.com/beego/beego/v2/adapter/session"
+	"github.com/beego/beego/v2/server/web/session/mysql"
 )
 
 var (

adapter/session/postgres/sess_postgresql.go

@@ -54,10 +54,10 @@ import (
 	"context"
 	"net/http"
 
-	"github.com/beego/beego/v2/adapter/session"
 	// import postgresql Driver
 	_ "github.com/lib/pq"
 
+	"github.com/beego/beego/v2/adapter/session"
 	"github.com/beego/beego/v2/server/web/session/postgres"
 )
 

adapter/session/redis/sess_redis.go

@@ -37,7 +37,6 @@ import (
 	"net/http"
 
 	"github.com/beego/beego/v2/adapter/session"
-
 	beeRedis "github.com/beego/beego/v2/server/web/session/redis"
 )
 

adapter/session/redis_sentinel/sess_redis_sentinel.go

@@ -37,7 +37,6 @@ import (
 	"net/http"
 
 	"github.com/beego/beego/v2/adapter/session"
-
 	sentinel "github.com/beego/beego/v2/server/web/session/redis_sentinel"
 )
 

adapter/session/ssdb/sess_ssdb.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 
 	"github.com/beego/beego/v2/adapter/session"
-
 	beeSsdb "github.com/beego/beego/v2/server/web/session/ssdb"
 )
 

adapter/tree.go

@@ -16,9 +16,8 @@ package adapter
 
 import (
 	"github.com/beego/beego/v2/adapter/context"
-	beecontext "github.com/beego/beego/v2/server/web/context"
-
 	"github.com/beego/beego/v2/server/web"
+	beecontext "github.com/beego/beego/v2/server/web/context"
 )
 
 // Tree has three elements: FixRouter/wildcard/leaves

adapter/utils/captcha/captcha.go

@@ -63,11 +63,10 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/beego/beego/v2/server/web/captcha"
-	beecontext "github.com/beego/beego/v2/server/web/context"
-
 	"github.com/beego/beego/v2/adapter/cache"
 	"github.com/beego/beego/v2/adapter/context"
+	"github.com/beego/beego/v2/server/web/captcha"
+	beecontext "github.com/beego/beego/v2/server/web/context"
 )
 
 var (