diff --git a/adapter/controller.go b/adapter/controller.go index 15d813ab..840abb48 100644 --- a/adapter/controller.go +++ b/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 ( diff --git a/adapter/error.go b/adapter/error.go index a4d0bc00..67f2ab82 100644 --- a/adapter/error.go +++ b/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 ( diff --git a/adapter/log.go b/adapter/log.go index edf101ad..9fc3a551 100644 --- a/adapter/log.go +++ b/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. diff --git a/adapter/namespace.go b/adapter/namespace.go index af7c77f8..0a90c5c1 100644 --- a/adapter/namespace.go +++ b/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 diff --git a/adapter/plugins/cors/cors.go b/adapter/plugins/cors/cors.go index 89ac9c68..c02ab877 100644 --- a/adapter/plugins/cors/cors.go +++ b/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. diff --git a/adapter/router.go b/adapter/router.go index 9a615efe..5011548e 100644 --- a/adapter/router.go +++ b/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 diff --git a/adapter/session/memcache/sess_memcache.go b/adapter/session/memcache/sess_memcache.go index dfbc2d6e..7cd8d733 100644 --- a/adapter/session/memcache/sess_memcache.go +++ b/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" ) diff --git a/adapter/session/mysql/sess_mysql.go b/adapter/session/mysql/sess_mysql.go index 5272d3fa..71c2d4a7 100644 --- a/adapter/session/mysql/sess_mysql.go +++ b/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 ( diff --git a/adapter/session/postgres/sess_postgresql.go b/adapter/session/postgres/sess_postgresql.go index a6278f17..5807d551 100644 --- a/adapter/session/postgres/sess_postgresql.go +++ b/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" ) diff --git a/adapter/session/redis/sess_redis.go b/adapter/session/redis/sess_redis.go index d38a675d..220a59cd 100644 --- a/adapter/session/redis/sess_redis.go +++ b/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" ) diff --git a/adapter/session/redis_sentinel/sess_redis_sentinel.go b/adapter/session/redis_sentinel/sess_redis_sentinel.go index 4b7dab77..633fb5fa 100644 --- a/adapter/session/redis_sentinel/sess_redis_sentinel.go +++ b/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" ) diff --git a/adapter/session/ssdb/sess_ssdb.go b/adapter/session/ssdb/sess_ssdb.go index 73ead908..9d08b2ab 100644 --- a/adapter/session/ssdb/sess_ssdb.go +++ b/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" ) diff --git a/adapter/tree.go b/adapter/tree.go index fe9f6933..3d22d9ac 100644 --- a/adapter/tree.go +++ b/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 diff --git a/adapter/utils/captcha/captcha.go b/adapter/utils/captcha/captcha.go index edca528d..741be9a5 100644 --- a/adapter/utils/captcha/captcha.go +++ b/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 ( diff --git a/client/httplib/filter/log/filter_test.go b/client/httplib/filter/log/filter_test.go index 4ee94a0d..b17dd395 100644 --- a/client/httplib/filter/log/filter_test.go +++ b/client/httplib/filter/log/filter_test.go @@ -20,8 +20,9 @@ import ( "testing" "time" - "github.com/beego/beego/v2/client/httplib" "github.com/stretchr/testify/assert" + + "github.com/beego/beego/v2/client/httplib" ) func TestFilterChain(t *testing.T) { diff --git a/client/orm/filter/bean/default_value_filter.go b/client/orm/filter/bean/default_value_filter.go index b71903b3..f8b2e8fc 100644 --- a/client/orm/filter/bean/default_value_filter.go +++ b/client/orm/filter/bean/default_value_filter.go @@ -19,10 +19,9 @@ import ( "reflect" "strings" - "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/v2/client/orm" "github.com/beego/beego/v2/core/bean" + "github.com/beego/beego/v2/core/logs" ) // DefaultValueFilterChainBuilder only works for InsertXXX method, diff --git a/client/orm/filter_orm_decorator_test.go b/client/orm/filter_orm_decorator_test.go index 6c3bc72b..a4b3f488 100644 --- a/client/orm/filter_orm_decorator_test.go +++ b/client/orm/filter_orm_decorator_test.go @@ -21,9 +21,9 @@ import ( "sync" "testing" - "github.com/beego/beego/v2/core/utils" - "github.com/stretchr/testify/assert" + + "github.com/beego/beego/v2/core/utils" ) func TestFilterOrmDecorator_Read(t *testing.T) { diff --git a/client/orm/models_test.go b/client/orm/models_test.go index 0051c126..54712f48 100644 --- a/client/orm/models_test.go +++ b/client/orm/models_test.go @@ -25,8 +25,6 @@ import ( _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" _ "github.com/mattn/go-sqlite3" - // As tidb can't use go get, so disable the tidb testing now - // _ "github.com/pingcap/tidb" ) // A slice string field. diff --git a/client/orm/orm.go b/client/orm/orm.go index fa96de4f..e168e9ec 100644 --- a/client/orm/orm.go +++ b/client/orm/orm.go @@ -63,11 +63,9 @@ import ( "time" "github.com/beego/beego/v2/client/orm/clauses/order_clause" - "github.com/beego/beego/v2/client/orm/hints" - "github.com/beego/beego/v2/core/utils" - "github.com/beego/beego/v2/core/logs" + "github.com/beego/beego/v2/core/utils" ) // DebugQueries define the debug diff --git a/client/orm/orm_test.go b/client/orm/orm_test.go index fd6e3dd1..58f2a597 100644 --- a/client/orm/orm_test.go +++ b/client/orm/orm_test.go @@ -31,11 +31,10 @@ import ( "testing" "time" - "github.com/beego/beego/v2/client/orm/clauses/order_clause" - - "github.com/beego/beego/v2/client/orm/hints" - "github.com/stretchr/testify/assert" + + "github.com/beego/beego/v2/client/orm/clauses/order_clause" + "github.com/beego/beego/v2/client/orm/hints" ) var _ = os.PathSeparator diff --git a/core/config/xml/xml.go b/core/config/xml/xml.go index 56bbd428..9eed2fa0 100644 --- a/core/config/xml/xml.go +++ b/core/config/xml/xml.go @@ -39,12 +39,11 @@ import ( "strings" "sync" + "github.com/beego/x2j" "github.com/mitchellh/mapstructure" "github.com/beego/beego/v2/core/config" "github.com/beego/beego/v2/core/logs" - - "github.com/beego/x2j" ) // Config is a xml config parser and implements Config interface. diff --git a/server/web/captcha/captcha.go b/server/web/captcha/captcha.go index e0a9a6ed..2aca5e13 100644 --- a/server/web/captcha/captcha.go +++ b/server/web/captcha/captcha.go @@ -68,7 +68,6 @@ import ( "time" "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/v2/core/utils" "github.com/beego/beego/v2/server/web" "github.com/beego/beego/v2/server/web/context" diff --git a/server/web/config.go b/server/web/config.go index bef92cfa..9be0b163 100644 --- a/server/web/config.go +++ b/server/web/config.go @@ -27,10 +27,9 @@ import ( "github.com/beego/beego/v2" "github.com/beego/beego/v2/core/config" "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/v2/server/web/session" - "github.com/beego/beego/v2/core/utils" "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/session" ) // Config is the main struct for BConfig diff --git a/server/web/context/context.go b/server/web/context/context.go index bf6da3d2..dde5e10d 100644 --- a/server/web/context/context.go +++ b/server/web/context/context.go @@ -35,9 +35,8 @@ import ( "strings" "time" - "github.com/beego/beego/v2/server/web/session" - "github.com/beego/beego/v2/core/utils" + "github.com/beego/beego/v2/server/web/session" ) // Commonly used mime-types diff --git a/server/web/controller.go b/server/web/controller.go index 8f935228..a767fac4 100644 --- a/server/web/controller.go +++ b/server/web/controller.go @@ -32,11 +32,12 @@ import ( "strings" "sync" + "github.com/gogo/protobuf/proto" + "gopkg.in/yaml.v2" + "github.com/beego/beego/v2/server/web/context" "github.com/beego/beego/v2/server/web/context/param" "github.com/beego/beego/v2/server/web/session" - "github.com/gogo/protobuf/proto" - "gopkg.in/yaml.v2" ) var ( diff --git a/server/web/controller_test.go b/server/web/controller_test.go index 7f810c1f..09fdf1d8 100644 --- a/server/web/controller_test.go +++ b/server/web/controller_test.go @@ -24,9 +24,10 @@ import ( "strconv" "testing" - "github.com/beego/beego/v2/server/web/context" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/beego/beego/v2/server/web/context" ) func TestGetInt(t *testing.T) { diff --git a/server/web/error.go b/server/web/error.go index 85ae5c8c..118585dc 100644 --- a/server/web/error.go +++ b/server/web/error.go @@ -25,7 +25,6 @@ import ( "github.com/beego/beego/v2" "github.com/beego/beego/v2/core/utils" - "github.com/beego/beego/v2/server/web/context" ) diff --git a/server/web/filter/session/filter_test.go b/server/web/filter/session/filter_test.go index 43046bf3..6b413962 100644 --- a/server/web/filter/session/filter_test.go +++ b/server/web/filter/session/filter_test.go @@ -5,10 +5,11 @@ import ( "net/http/httptest" "testing" + "github.com/google/uuid" + "github.com/beego/beego/v2/server/web" webContext "github.com/beego/beego/v2/server/web/context" "github.com/beego/beego/v2/server/web/session" - "github.com/google/uuid" ) func testRequest(t *testing.T, handler *web.ControllerRegister, path string, method string, code int) { diff --git a/server/web/hooks.go b/server/web/hooks.go index a146f848..0f72e711 100644 --- a/server/web/hooks.go +++ b/server/web/hooks.go @@ -2,12 +2,13 @@ package web import ( "encoding/json" - "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/v2/server/web/context" - "github.com/beego/beego/v2/server/web/session" "mime" "net/http" "path/filepath" + + "github.com/beego/beego/v2/core/logs" + "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/session" ) // register MIME type with content type diff --git a/server/web/mock/context.go b/server/web/mock/context.go index 81c8e626..46336c70 100644 --- a/server/web/mock/context.go +++ b/server/web/mock/context.go @@ -15,8 +15,9 @@ package mock import ( - beegoCtx "github.com/beego/beego/v2/server/web/context" "net/http" + + beegoCtx "github.com/beego/beego/v2/server/web/context" ) func NewMockContext(req *http.Request) (*beegoCtx.Context, *HttpResponse) { diff --git a/server/web/mock/context_test.go b/server/web/mock/context_test.go index 640a9223..98af12d3 100644 --- a/server/web/mock/context_test.go +++ b/server/web/mock/context_test.go @@ -18,10 +18,12 @@ import ( "bytes" "context" "fmt" - "github.com/beego/beego/v2/server/web" - "github.com/stretchr/testify/assert" "net/http" "testing" + + "github.com/stretchr/testify/assert" + + "github.com/beego/beego/v2/server/web" ) type TestController struct { diff --git a/server/web/mock/session.go b/server/web/mock/session.go index 6d4f3df0..66a65747 100644 --- a/server/web/mock/session.go +++ b/server/web/mock/session.go @@ -16,10 +16,12 @@ package mock import ( "context" + "net/http" + + "github.com/google/uuid" + "github.com/beego/beego/v2/server/web" "github.com/beego/beego/v2/server/web/session" - "github.com/google/uuid" - "net/http" ) // NewSessionProvider create new SessionProvider diff --git a/server/web/mock/session_test.go b/server/web/mock/session_test.go index 82051722..b09881ef 100644 --- a/server/web/mock/session_test.go +++ b/server/web/mock/session_test.go @@ -16,10 +16,12 @@ package mock import ( "bytes" - "github.com/beego/beego/v2/server/web" - "github.com/stretchr/testify/assert" "net/http" "testing" + + "github.com/stretchr/testify/assert" + + "github.com/beego/beego/v2/server/web" ) func TestSessionProvider(t *testing.T) { diff --git a/server/web/router.go b/server/web/router.go index 34680b2c..f47cd6ff 100644 --- a/server/web/router.go +++ b/server/web/router.go @@ -27,7 +27,6 @@ import ( "time" "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/v2/core/utils" beecontext "github.com/beego/beego/v2/server/web/context" "github.com/beego/beego/v2/server/web/context/param" diff --git a/server/web/router_test.go b/server/web/router_test.go index e8b823d2..d81276d8 100644 --- a/server/web/router_test.go +++ b/server/web/router_test.go @@ -23,7 +23,6 @@ import ( "testing" "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/v2/server/web/context" ) diff --git a/server/web/server.go b/server/web/server.go index e1ef1a03..2b7c9d26 100644 --- a/server/web/server.go +++ b/server/web/server.go @@ -32,9 +32,8 @@ import ( "golang.org/x/crypto/acme/autocert" "github.com/beego/beego/v2/core/logs" - beecontext "github.com/beego/beego/v2/server/web/context" - "github.com/beego/beego/v2/core/utils" + beecontext "github.com/beego/beego/v2/server/web/context" "github.com/beego/beego/v2/server/web/grace" ) diff --git a/server/web/session/memcache/sess_memcache.go b/server/web/session/memcache/sess_memcache.go index cf191fdf..64268532 100644 --- a/server/web/session/memcache/sess_memcache.go +++ b/server/web/session/memcache/sess_memcache.go @@ -38,9 +38,9 @@ import ( "strings" "sync" - "github.com/beego/beego/v2/server/web/session" - "github.com/bradfitz/gomemcache/memcache" + + "github.com/beego/beego/v2/server/web/session" ) var mempder = &MemProvider{} diff --git a/server/web/session/mysql/sess_mysql.go b/server/web/session/mysql/sess_mysql.go index 6df2737d..2755bded 100644 --- a/server/web/session/mysql/sess_mysql.go +++ b/server/web/session/mysql/sess_mysql.go @@ -47,9 +47,10 @@ import ( "sync" "time" - "github.com/beego/beego/v2/server/web/session" // import mysql driver _ "github.com/go-sql-driver/mysql" + + "github.com/beego/beego/v2/server/web/session" ) var ( diff --git a/server/web/session/postgres/sess_postgresql.go b/server/web/session/postgres/sess_postgresql.go index b26b82ce..810b27b9 100644 --- a/server/web/session/postgres/sess_postgresql.go +++ b/server/web/session/postgres/sess_postgresql.go @@ -57,9 +57,10 @@ import ( "sync" "time" - "github.com/beego/beego/v2/server/web/session" // import postgresql Driver _ "github.com/lib/pq" + + "github.com/beego/beego/v2/server/web/session" ) var postgresqlpder = &Provider{} diff --git a/server/web/staticfile.go b/server/web/staticfile.go index e5d3c3ed..9560c7ab 100644 --- a/server/web/staticfile.go +++ b/server/web/staticfile.go @@ -29,7 +29,6 @@ import ( lru "github.com/hashicorp/golang-lru" "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/v2/server/web/context" ) diff --git a/server/web/tree.go b/server/web/tree.go index 2a8ca489..3716d4f4 100644 --- a/server/web/tree.go +++ b/server/web/tree.go @@ -20,7 +20,6 @@ import ( "strings" "github.com/beego/beego/v2/core/utils" - "github.com/beego/beego/v2/server/web/context" )