Fix imports by gci

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"

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

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

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 (

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) {

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"
 )
 

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) {

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

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) {

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 {

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

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) {

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"

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"
 )
 

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"
 )
 

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{}

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 (

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{}

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"
 )
 

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"
 )