ci(gci/import): improve golangci.yml and add gci linter (#4010)

.github/workflows/doc-build.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set Up Golang Environment
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22.5
+          go-version: 1.23.4
           cache: false
       - name: download goframe docs
         run: ./download.sh

.github/workflows/golangci-lint.yml

@@ -27,7 +27,7 @@ jobs:
   golangci:
     strategy:
       matrix:
-        go-version: [ '1.20','1.21.4','1.22', '1.23' ]
+        go-version: [ '1.20','1.21.4','1.22','1.23' ]
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
@@ -41,5 +41,5 @@ jobs:
         uses: golangci/golangci-lint-action@v6
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.60.1
-          args: --timeout 3m0s
+          version: v1.62.2
+          args: --timeout 3m0s

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set Up Golang Environment
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22.5
+          go-version: 1.23.4
       
       - name: Build CLI Binary
         run: |

.golangci.yml

@@ -40,9 +40,11 @@ linters:
     - errcheck      # Errcheck is a program for checking for unchecked errors in go programs.
     - errchkjson    # Checks types passed to the JSON encoding functions. Reports unsupported types and optionally reports occasions, where the check for the returned error can be omitted.
     - funlen        # Tool for detection of long functions
+    - gofmt         # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification
+    - goimports     # Check import statements are formatted according to the 'goimport' command. Reformat imports in autofix mode.
+    - gci           # Gci controls Go package import order and makes it always deterministic.
     - goconst       # Finds repeated strings that could be replaced by a constant
     - gocritic      # Provides diagnostics that check for bugs, performance and style issues.
-    - gofmt         # Gofmt checks whether code was gofmt-ed. By default this tool runs with -s option to check for code simplification
     - gosimple      # Linter for Go source code that specializes in simplifying code
     - govet         # Vet examines Go source code and reports suspicious constructs, such as Printf calls whose arguments do not align with the format string
     - misspell      # Finds commonly misspelled English words in comments
@@ -79,7 +81,51 @@ linters-settings:
     locale: US
     ignore-words:
       - cancelled
-
+  # https://golangci-lint.run/usage/linters/#gofmt
+  gofmt:
+    # Simplify code: gofmt with `-s` option.
+    # Default: true
+    simplify: true
+    # Apply the rewrite rules to the source before reformatting.
+    # https://pkg.go.dev/cmd/gofmt
+    # Default: []
+    rewrite-rules: [ ]
+      # - pattern: 'interface{}'
+      #   replacement: 'any'
+      # - pattern: 'a[b:len(a)]'
+      #   replacement: 'a[b:]'
+  goimports:
+    # A comma-separated list of prefixes, which, if set, checks import paths
+    # with the given prefixes are grouped after 3rd-party packages.
+    # Default: ""
+    local-prefixes: github.com/gogf/gf/v2
+  gci:
+    # Section configuration to compare against.
+    # Section names are case-insensitive and may contain parameters in ().
+    # The default order of sections is `standard > default > custom > blank > dot > alias > localmodule`,
+    # If `custom-order` is `true`, it follows the order of `sections` option.
+    # Default: ["standard", "default"]
+    sections:
+      - standard # Standard section: captures all standard packages.
+      - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
+      - default # Default section: contains all imports that could not be matched to another section type.
+      - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
+      # - alias # Alias section: contains all alias imports. This section is not present unless explicitly enabled.
+      # - localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
+      - prefix(github.com/gogf/gf) # Custom section: groups all imports with the specified Prefix.
+      - prefix(github.com/gogf/gf/cmd) # Custom section: groups all imports with the specified Prefix.
+      - prefix(github.com/gogf/gfcontrib) # Custom section: groups all imports with the specified Prefix.
+      - prefix(github.com/gogf/gf/example) # Custom section: groups all imports with the specified Prefix.
+    # Skip generated files.
+    # Default: true
+    skip-generated: true
+    # Enable custom order of sections.
+    # If `true`, make the section order the same as the order of `sections`.
+    # Default: false
+    custom-order: true
+    # Drops lexical ordering for custom sections.
+    # Default: false
+    no-lex-order: true
   # https://golangci-lint.run/usage/linters/#revive
   # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
   revive:
@@ -259,16 +305,3 @@ linters-settings:
     # Default: ["*"]
     checks: [ "all","-SA1019","-SA4015","-SA1029","-SA1016","-SA9003","-SA4006","-SA6003" ]
 
-  # https://golangci-lint.run/usage/linters/#gofmt
-  gofmt:
-    # Simplify code: gofmt with `-s` option.
-    # Default: true
-    simplify: true
-    # Apply the rewrite rules to the source before reformatting.
-    # https://pkg.go.dev/cmd/gofmt
-    # Default: []
-    rewrite-rules: [ ]
-      # - pattern: 'interface{}'
-      #   replacement: 'any'
-      # - pattern: 'a[b:len(a)]'
-      #   replacement: 'a[b:]'

cmd/gf/gfcmd/gfcmd.go

@@ -10,6 +10,8 @@ import (
 	"context"
 	"runtime"
 
+	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
+
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@@ -19,7 +21,6 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
-	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

cmd/gf/internal/cmd/cmd_doc.go

@@ -16,10 +16,11 @@ import (
 	"path/filepath"
 	"time"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/encoding/gcompress"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 const (

cmd/gf/internal/cmd/cmd_fix.go

@@ -9,14 +9,14 @@ package cmd
 import (
 	"context"
 
-	"github.com/gogf/gf/v2/os/gproc"
-	"github.com/gogf/gf/v2/text/gregex"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gproc"
+	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 var (

cmd/gf/internal/cmd/cmd_init.go

@@ -12,9 +12,6 @@ import (
 	"os"
 	"strings"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gfile"
@@ -22,6 +19,10 @@ import (
 	"github.com/gogf/gf/v2/os/gres"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 var (

cmd/gf/internal/cmd/cmd_up.go

@@ -13,14 +13,15 @@ import (
 
 	"github.com/gogf/selfupdate"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 var (

cmd/gf/internal/cmd/cmd_z_unit_gen_ctrl_test.go

@@ -10,11 +10,12 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genctrl"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gogf/gf/v2/util/gutil"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genctrl"
 )
 
 func Test_Gen_Ctrl_Default(t *testing.T) {

cmd/gf/internal/cmd/cmd_z_unit_gen_dao_test.go

@@ -11,7 +11,6 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcfg"
@@ -20,6 +19,8 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gogf/gf/v2/util/gutil"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
 )
 
 func Test_Gen_Dao_Default(t *testing.T) {

cmd/gf/internal/cmd/cmd_z_unit_gen_pb_test.go

@@ -10,11 +10,12 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpb"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/guid"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpb"
 )
 
 func TestGenPbIssue3882(t *testing.T) {

cmd/gf/internal/cmd/cmd_z_unit_gen_pbentity_test.go

@@ -11,12 +11,13 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpbentity"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gogf/gf/v2/util/gutil"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genpbentity"
 )
 
 func Test_Gen_Pbentity_Default(t *testing.T) {

cmd/gf/internal/cmd/cmd_z_unit_gen_service_test.go

@@ -10,11 +10,12 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genservice"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gogf/gf/v2/util/gutil"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/genservice"
 )
 
 func Test_Gen_Service_Default(t *testing.T) {

cmd/gf/internal/cmd/genctrl/genctrl_calculate.go

@@ -7,10 +7,11 @@
 package genctrl
 
 import (
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 func (c CGenCtrl) getApiItemsInSrc(apiModuleFolderPath string) (items []apiItem, err error) {

cmd/gf/internal/cmd/genctrl/genctrl_generate_ctrl.go

@@ -11,12 +11,13 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 type controllerGenerator struct{}

cmd/gf/internal/cmd/genctrl/genctrl_generate_ctrl_clear.go

@@ -9,9 +9,10 @@ package genctrl
 import (
 	"fmt"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 type controllerClearer struct{}

cmd/gf/internal/cmd/genctrl/genctrl_generate_interface.go

@@ -10,15 +10,16 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 type apiInterfaceGenerator struct{}

cmd/gf/internal/cmd/genctrl/genctrl_generate_sdk.go

@@ -10,13 +10,14 @@ import (
 	"fmt"
 	"path/filepath"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 type apiSdkGenerator struct{}

cmd/gf/internal/cmd/gendao/gendao.go

@@ -13,7 +13,6 @@ import (
 
 	"golang.org/x/mod/modfile"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
@@ -24,6 +23,7 @@ import (
 	"github.com/gogf/gf/v2/util/gtag"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 const (

cmd/gf/internal/cmd/genenums/genenums.go

@@ -11,12 +11,13 @@ import (
 
 	"golang.org/x/tools/go/packages"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 type (

cmd/gf/internal/cmd/genenums/genenums_parser.go

@@ -10,10 +10,11 @@ import (
 	"go/constant"
 	"go/types"
 
+	"golang.org/x/tools/go/packages"
+
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
-	"golang.org/x/tools/go/packages"
 )
 
 const pkgLoadMode = 0xffffff

cmd/gf/internal/cmd/genpb/genpb.go

@@ -9,11 +9,12 @@ package genpb
 import (
 	"context"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/util/gtag"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 type (

cmd/gf/internal/cmd/genpb/genpb_controller.go

@@ -11,11 +11,12 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 type generateControllerInput struct {

cmd/gf/internal/cmd/genpb/genpb_tag.go

@@ -10,13 +10,14 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 type generateStructTagInput struct {

cmd/gf/internal/cmd/genpbentity/genpbentity.go

@@ -14,11 +14,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/olekukonko/tablewriter"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
@@ -29,6 +26,10 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/gtag"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 type (

cmd/gf/internal/cmd/genservice/genservice_calculate.go

@@ -10,12 +10,13 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 func (c CGenService) calculateImportedItems(

cmd/gf/internal/cmd/genservice/genservice_generate.go

@@ -10,13 +10,14 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 type generateServiceFilesInput struct {

cmd/gf/internal/cmd/genservice/genservice_generate_template.go

@@ -10,11 +10,12 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
 )
 
 func (c CGenService) generatePackageImports(generatedContent *bytes.Buffer, packageName string, imports []string) {

cmd/gf/internal/cmd/testdata/genservice/logic/article/article.go

@@ -11,8 +11,9 @@ import (
 	"go/ast"
 	t "time"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/service"
 	gdbalias "github.com/gogf/gf/v2/database/gdb"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/genservice/service"
 )
 
 type sArticle struct {

cmd/gf/internal/cmd/testdata/genservice/logic/article/article_extra.go

@@ -14,12 +14,13 @@ package article
 import (
 	"context"
 
-	// This is a random comment
-	gdbas "github.com/gogf/gf/v2/database/gdb"
 	/**
 	 *
 	 */
 	_ "github.com/gogf/gf/v2/os/gfile"
+
+	// This is a random comment
+	gdbas "github.com/gogf/gf/v2/database/gdb"
 )
 
 // T1 random comment

cmd/gf/internal/cmd/testdata/issue/3835/logic/issue3835/issue3835.go

@@ -4,6 +4,7 @@ import (
 	"context"
 
 	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/testdata/issue/3835/service"
+
 	"github.com/gogf/gf/contrib/drivers/mysql/v2"
 )
 

cmd/gf/internal/utility/utils/utils_test.go

@@ -10,8 +10,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 	"github.com/gogf/gf/v2/test/gtest"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )
 
 func Test_GetModPath(t *testing.T) {

cmd/gf/main.go

@@ -7,10 +7,11 @@
 package main
 
 import (
-	"github.com/gogf/gf/cmd/gf/v2/gfcmd"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/os/gctx"
+
+	"github.com/gogf/gf/cmd/gf/v2/gfcmd"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )
 
 func main() {

container/garray/garray_z_example_normal_any_test.go

@@ -9,10 +9,9 @@ package garray_test
 import (
 	"fmt"
 
-	"github.com/gogf/gf/v2/internal/empty"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/empty"
 )
 
 func ExampleNew() {

container/garray/garray_z_example_normal_int_test.go

@@ -9,10 +9,9 @@ package garray_test
 import (
 	"fmt"
 
-	"github.com/gogf/gf/v2/internal/empty"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/util/gconv"
 )

container/garray/garray_z_example_normal_str_test.go

@@ -10,10 +10,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/gogf/gf/v2/internal/empty"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_example_sorted_str_test.go

@@ -9,10 +9,9 @@ package garray_test
 import (
 	"fmt"
 
-	"github.com/gogf/gf/v2/internal/empty"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/util/gconv"
 )

container/garray/garray_z_unit_normal_any_test.go

@@ -12,10 +12,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/v2/internal/empty"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_unit_normal_int_test.go

@@ -12,10 +12,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/v2/internal/empty"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_unit_normal_str_test.go

@@ -13,10 +13,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/v2/internal/empty"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_unit_sorted_any_test.go

@@ -13,10 +13,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/v2/internal/empty"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_unit_sorted_int_test.go

@@ -12,10 +12,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/v2/internal/empty"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/gconv"

container/garray/garray_z_unit_sorted_str_test.go

@@ -12,10 +12,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/v2/internal/empty"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/text/gstr"

container/gmap/gmap_hash_any_any_map.go

@@ -7,13 +7,14 @@
 package gmap
 
 import (
+	"reflect"
+
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/internal/deepcopy"
 	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/rwmutex"
 	"github.com/gogf/gf/v2/util/gconv"
-	"reflect"
 )
 
 // AnyAnyMap wraps map type `map[interface{}]interface{}` and provides more map features.

container/gmap/gmap_hash_int_any_map.go

@@ -8,13 +8,14 @@
 package gmap
 
 import (
+	"reflect"
+
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/internal/deepcopy"
 	"github.com/gogf/gf/v2/internal/empty"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/rwmutex"
 	"github.com/gogf/gf/v2/util/gconv"
-	"reflect"
 )
 
 // IntAnyMap implements map[int]interface{} with RWMutex that has switch.

container/gtree/gtree_avltree.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 
 	"github.com/emirpasic/gods/trees/avltree"
+
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/internal/rwmutex"
 	"github.com/gogf/gf/v2/text/gstr"

container/gtree/gtree_btree.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 
 	"github.com/emirpasic/gods/trees/btree"
+
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/internal/rwmutex"
 	"github.com/gogf/gf/v2/text/gstr"

container/gtree/gtree_redblacktree.go

@@ -10,6 +10,7 @@ import (
 	"fmt"
 
 	"github.com/emirpasic/gods/trees/redblacktree"
+
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/internal/rwmutex"

contrib/config/consul/consul_test.go

@@ -10,15 +10,15 @@ import (
 	"testing"
 	"time"
 
-	consul "github.com/gogf/gf/contrib/config/consul/v2"
-
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/guid"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/go-cleanhttp"
 
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/guid"
+
+	consul "github.com/gogf/gf/contrib/config/consul/v2"
 )
 
 func TestConsul(t *testing.T) {

contrib/config/kubecm/kubecm_test.go

@@ -13,13 +13,14 @@ import (
 	kubeMetaV1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 
-	"github.com/gogf/gf/contrib/config/kubecm/v2"
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
+
+	"github.com/gogf/gf/contrib/config/kubecm/v2"
 )
 
 const (

contrib/config/nacos/nacos_test.go

@@ -12,11 +12,12 @@ import (
 	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
 	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 
-	"github.com/gogf/gf/contrib/config/nacos/v2"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
+
+	"github.com/gogf/gf/contrib/config/nacos/v2"
 )
 
 var (

contrib/drivers/clickhouse/clickhouse_z_unit_issue_test.go

@@ -7,9 +7,10 @@
 package clickhouse
 
 import (
-	"github.com/shopspring/decimal"
 	"testing"
 
+	"github.com/shopspring/decimal"
+
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/test/gtest"

contrib/drivers/dm/dm_convert.go

@@ -8,7 +8,6 @@ package dm
 
 import (
 	"context"
-
 	"time"
 
 	"github.com/gogf/gf/v2/os/gtime"

contrib/drivers/dm/dm_do_filter.go

@@ -8,7 +8,6 @@ package dm
 
 import (
 	"context"
-
 	"strings"
 
 	"github.com/gogf/gf/v2/database/gdb"

contrib/drivers/dm/dm_open.go

@@ -9,7 +9,6 @@ package dm
 import (
 	"database/sql"
 	"fmt"
-
 	"net/url"
 	"strings"
 

contrib/drivers/dm/dm_table_fields.go

@@ -9,7 +9,6 @@ package dm
 import (
 	"context"
 	"fmt"
-
 	"strings"
 
 	"github.com/gogf/gf/v2/database/gdb"

contrib/drivers/mssql/mssql_z_unit_model_test.go

@@ -12,14 +12,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/v2/util/gconv"
-
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gogf/gf/v2/util/gutil"
 )

contrib/drivers/mysql/mysql_z_unit_feature_with_test.go

@@ -10,10 +10,9 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/gogf/gf/v2/os/gtime"
-
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
+	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gmeta"

contrib/drivers/oracle/oracle_do_insert.go

@@ -13,11 +13,10 @@ import (
 	"strings"
 
 	"github.com/gogf/gf/v2/container/gset"
-	"github.com/gogf/gf/v2/text/gstr"
-
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 )
 

contrib/drivers/oracle/oracle_z_unit_basic_test.go

@@ -12,11 +12,10 @@ import (
 	"testing"
 
 	"github.com/gogf/gf/v2/database/gdb"
-	"github.com/gogf/gf/v2/util/gconv"
-
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 func Test_Tables(t *testing.T) {

contrib/drivers/pgsql/pgsql_convert.go

@@ -8,10 +8,11 @@ package pgsql
 
 import (
 	"context"
-	"github.com/lib/pq"
 	"reflect"
 	"strings"
 
+	"github.com/lib/pq"
+
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/text/gregex"

contrib/drivers/pgsql/pgsql_do_filter.go

@@ -9,6 +9,7 @@ package pgsql
 import (
 	"context"
 	"fmt"
+
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"

contrib/drivers/pgsql/pgsql_do_insert.go

@@ -9,6 +9,7 @@ package pgsql
 import (
 	"context"
 	"database/sql"
+
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"

contrib/drivers/pgsql/pgsql_z_unit_init_test.go

@@ -7,11 +7,11 @@
 package pgsql_test
 
 import (
-	_ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
-
 	"context"
 	"fmt"
 
+	_ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"

contrib/drivers/pgsql/pgsql_z_unit_issue_test.go

@@ -11,7 +11,6 @@ import (
 	"testing"
 
 	"github.com/gogf/gf/v2/database/gdb"
-
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/test/gtest"

contrib/metric/otelmetric/otelmetric_z_unit_http_test.go

@@ -14,7 +14,6 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"go.opentelemetry.io/otel/exporters/prometheus"
 
-	"github.com/gogf/gf/contrib/metric/otelmetric/v2"
 	"github.com/gogf/gf/v2"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
@@ -24,6 +23,8 @@ import (
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/guid"
+
+	"github.com/gogf/gf/contrib/metric/otelmetric/v2"
 )
 
 func Test_HTTP_Server(t *testing.T) {

contrib/metric/otelmetric/otelmetric_z_unit_test.go

@@ -13,12 +13,13 @@ import (
 	"go.opentelemetry.io/otel/sdk/metric"
 	"go.opentelemetry.io/otel/sdk/metric/metricdata"
 
-	"github.com/gogf/gf/contrib/metric/otelmetric/v2"
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gmetric"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/contrib/metric/otelmetric/v2"
 )
 
 func Test_Basic(t *testing.T) {

contrib/nosql/redis/redis_z_group_set_test.go

@@ -7,9 +7,10 @@
 package redis_test
 
 import (
+	"testing"
+
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
-	"testing"
 )
 
 func Test_GroupSet_SAdd(t *testing.T) {

contrib/nosql/redis/redis_z_unit_config_test.go

@@ -7,10 +7,10 @@
 package redis_test
 
 import (
-	"github.com/gogf/gf/v2/container/gvar"
 	"testing"
 	"time"
 
+	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/database/gredis"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/test/gtest"

contrib/nosql/redis/redis_z_unit_gcache_adapter_test.go

@@ -8,11 +8,11 @@ package redis_test
 
 import (
 	"context"
-	"github.com/gogf/gf/v2/frame/g"
 	"testing"
 	"time"
 
 	"github.com/gogf/gf/v2/database/gredis"
+	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcache"
 	"github.com/gogf/gf/v2/test/gtest"
 )

contrib/registry/etcd/etcd_z_test.go

@@ -9,11 +9,12 @@ package etcd_test
 import (
 	"testing"
 
-	"github.com/gogf/gf/contrib/registry/etcd/v2"
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
+
+	"github.com/gogf/gf/contrib/registry/etcd/v2"
 )
 
 func TestRegistry(t *testing.T) {

contrib/registry/file/file_z_basic_test.go

@@ -9,12 +9,13 @@ package file_test
 import (
 	"testing"
 
-	"github.com/gogf/gf/contrib/registry/file/v2"
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
+
+	"github.com/gogf/gf/contrib/registry/file/v2"
 )
 
 func TestRegistry(t *testing.T) {

contrib/registry/file/file_z_http_test.go

@@ -11,7 +11,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/contrib/registry/file/v2"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/net/gsvc"
@@ -20,6 +19,8 @@ import (
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/guid"
+
+	"github.com/gogf/gf/contrib/registry/file/v2"
 )
 
 var ctx = gctx.GetInitCtx()

contrib/registry/nacos/nacos.go

@@ -10,6 +10,11 @@ package nacos
 import (
 	"context"
 
+	"github.com/nacos-group/nacos-sdk-go/v2/clients"
+	"github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client"
+	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/v2/vo"
+
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@@ -17,10 +22,6 @@ import (
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/nacos-group/nacos-sdk-go/v2/clients"
-	"github.com/nacos-group/nacos-sdk-go/v2/clients/naming_client"
-	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
-	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 )
 
 const (

contrib/registry/nacos/nacos_discovery.go

@@ -9,12 +9,13 @@ package nacos
 import (
 	"context"
 
+	"github.com/nacos-group/nacos-sdk-go/v2/model"
+	"github.com/nacos-group/nacos-sdk-go/v2/vo"
+
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/nacos-group/nacos-sdk-go/v2/model"
-	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 )
 
 // Search searches and returns services with specified condition.

contrib/registry/nacos/nacos_register.go

@@ -9,9 +9,10 @@ package nacos
 import (
 	"context"
 
+	"github.com/nacos-group/nacos-sdk-go/v2/vo"
+
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/nacos-group/nacos-sdk-go/v2/vo"
 )
 
 // Register registers `service` to Registry.

contrib/registry/nacos/nacos_service.go

@@ -9,10 +9,11 @@ package nacos
 import (
 	"fmt"
 
+	"github.com/nacos-group/nacos-sdk-go/v2/model"
+
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/nacos-group/nacos-sdk-go/v2/model"
 )
 
 // NewServiceFromInstance new one service from instance

contrib/registry/nacos/nacos_watcher.go

@@ -9,10 +9,11 @@ package nacos
 import (
 	"context"
 
+	"github.com/nacos-group/nacos-sdk-go/v2/model"
+
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/gsvc"
-	"github.com/nacos-group/nacos-sdk-go/v2/model"
 )
 
 // Watcher used to mange service event such as update.

contrib/registry/nacos/nacos_z_test.go

@@ -12,13 +12,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/contrib/registry/nacos/v2"
+	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
+
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
-	"github.com/nacos-group/nacos-sdk-go/v2/common/constant"
+
+	"github.com/gogf/gf/contrib/registry/nacos/v2"
 )
 
 const (

contrib/registry/zookeeper/zookeeper.go

@@ -8,9 +8,10 @@
 package zookeeper
 
 import (
+	"time"
+
 	"github.com/go-zookeeper/zk"
 	"golang.org/x/sync/singleflight"
-	"time"
 
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/gsvc"

contrib/registry/zookeeper/zookeeper_registrar.go

@@ -8,12 +8,13 @@ package zookeeper
 
 import (
 	"context"
-	"github.com/go-zookeeper/zk"
-	"github.com/gogf/gf/v2/errors/gerror"
 	"path"
 	"strings"
 	"time"
 
+	"github.com/go-zookeeper/zk"
+
+	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/gsvc"
 )
 

contrib/registry/zookeeper/zookeeper_watcher.go

@@ -9,11 +9,12 @@ package zookeeper
 import (
 	"context"
 	"errors"
-	"github.com/go-zookeeper/zk"
-	"golang.org/x/sync/singleflight"
 	"path"
 	"strings"
 
+	"github.com/go-zookeeper/zk"
+	"golang.org/x/sync/singleflight"
+
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/gsvc"
 )

contrib/rpc/grpcx/grpcx_interceptor_client.go

@@ -12,9 +12,10 @@ import (
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/status"
 
-	"github.com/gogf/gf/contrib/rpc/grpcx/v2/internal/tracing"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
+
+	"github.com/gogf/gf/contrib/rpc/grpcx/v2/internal/tracing"
 )
 
 // UnaryError handles the error types converting between grpc and gerror.

contrib/rpc/grpcx/grpcx_interceptor_server.go

@@ -8,17 +8,18 @@ package grpcx
 
 import (
 	"context"
-	"google.golang.org/protobuf/proto"
 
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
+	"google.golang.org/protobuf/proto"
 
-	"github.com/gogf/gf/contrib/rpc/grpcx/v2/internal/tracing"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gutil"
+
+	"github.com/gogf/gf/contrib/rpc/grpcx/v2/internal/tracing"
 )
 
 // ChainUnary returns a ServerOption that specifies the chained interceptor

contrib/rpc/grpcx/grpcx_registry_file.go

@@ -7,12 +7,12 @@
 package grpcx
 
 import (
-	"github.com/gogf/gf/contrib/registry/file/v2"
-
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gfile"
+
+	"github.com/gogf/gf/contrib/registry/file/v2"
 )
 
 // autoLoadAndRegisterFileRegistry checks and registers ETCD service as default service registry

contrib/rpc/grpcx/grpcx_unit_z_ctx_test.go

@@ -12,9 +12,10 @@ import (
 
 	"google.golang.org/grpc/metadata"
 
-	"github.com/gogf/gf/contrib/rpc/grpcx/v2"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/test/gtest"
+
+	"github.com/gogf/gf/contrib/rpc/grpcx/v2"
 )
 
 func Test_Ctx_Basic(t *testing.T) {

contrib/rpc/grpcx/grpcx_unit_z_grpc_server_basic_test.go

@@ -11,14 +11,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/contrib/rpc/grpcx/v2"
-	"github.com/gogf/gf/contrib/rpc/grpcx/v2/testdata/controller"
-	"github.com/gogf/gf/contrib/rpc/grpcx/v2/testdata/protobuf"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gipv4"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
+
+	"github.com/gogf/gf/contrib/rpc/grpcx/v2"
+	"github.com/gogf/gf/contrib/rpc/grpcx/v2/testdata/controller"
+	"github.com/gogf/gf/contrib/rpc/grpcx/v2/testdata/protobuf"
 )
 
 func Test_Grpcx_Grpc_Server_Basic(t *testing.T) {

contrib/rpc/grpcx/grpcx_unit_z_issue_test.go

@@ -9,16 +9,18 @@ package grpcx_test
 import (
 	"context"
 	"fmt"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/contrib/rpc/grpcx/v2"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials/insecure"
+
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/ghttp"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
+
+	"github.com/gogf/gf/contrib/rpc/grpcx/v2"
 )
 
 var ctx = context.Background()

contrib/rpc/grpcx/internal/balancer/balancer_builder.go

@@ -8,6 +8,7 @@ package balancer
 
 import (
 	"context"
+
 	"google.golang.org/grpc/balancer"
 	"google.golang.org/grpc/balancer/base"
 

contrib/rpc/grpcx/internal/tracing/tracing_interceptor_client.go

@@ -18,10 +18,11 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 
-	"github.com/gogf/gf/contrib/rpc/grpcx/v2/internal/grpcctx"
 	"github.com/gogf/gf/v2"
 	"github.com/gogf/gf/v2/net/gtrace"
 	"github.com/gogf/gf/v2/util/gconv"
+
+	"github.com/gogf/gf/contrib/rpc/grpcx/v2/internal/grpcctx"
 )
 
 // UnaryClientInterceptor returns a grpc.UnaryClientInterceptor suitable

contrib/rpc/grpcx/internal/tracing/tracing_interceptor_server.go

@@ -19,10 +19,11 @@ import (
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 
-	"github.com/gogf/gf/contrib/rpc/grpcx/v2/internal/grpcctx"
 	"github.com/gogf/gf/v2"
 	"github.com/gogf/gf/v2/net/gtrace"
 	"github.com/gogf/gf/v2/util/gconv"
+
+	"github.com/gogf/gf/contrib/rpc/grpcx/v2/internal/grpcctx"
 )
 
 // UnaryServerInterceptor returns a grpc.UnaryServerInterceptor suitable

contrib/sdk/httpclient/httpclient_z_unit_feature_handler_test.go

@@ -12,7 +12,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/contrib/sdk/httpclient/v2"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@@ -21,6 +20,8 @@ import (
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
+
+	"github.com/gogf/gf/contrib/sdk/httpclient/v2"
 )
 
 func Test_HttpClient_With_Default_Handler(t *testing.T) {

database/gdb/gdb_core_underlying.go

@@ -16,14 +16,13 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/trace"
 
-	"github.com/gogf/gf/v2/util/gconv"
-
 	"github.com/gogf/gf/v2"
 	"github.com/gogf/gf/v2/container/gvar"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/internal/intlog"
 	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/guid"
 )
 

debug/gdebug/gdebug_grid.go

@@ -12,10 +12,8 @@ import (
 	"strconv"
 )
 
-var (
-	// gridRegex is the regular expression object for parsing goroutine id from stack information.
-	gridRegex = regexp.MustCompile(`^\w+\s+(\d+)\s+`)
-)
+// gridRegex is the regular expression object for parsing goroutine id from stack information.
+var gridRegex = regexp.MustCompile(`^\w+\s+(\d+)\s+`)
 
 // GoroutineId retrieves and returns the current goroutine id from stack information.
 // Be very aware that, it is with low performance as it uses runtime.Stack function.

encoding/gcharset/gcharset.go

@@ -33,15 +33,13 @@ import (
 	"github.com/gogf/gf/v2/internal/intlog"
 )
 
-var (
-	// Alias for charsets.
-	charsetAlias = map[string]string{
-		"HZGB2312": "HZ-GB-2312",
-		"hzgb2312": "HZ-GB-2312",
-		"GB2312":   "HZ-GB-2312",
-		"gb2312":   "HZ-GB-2312",
-	}
-)
+// Alias for charsets.
+var charsetAlias = map[string]string{
+	"HZGB2312": "HZ-GB-2312",
+	"hzgb2312": "HZ-GB-2312",
+	"GB2312":   "HZ-GB-2312",
+	"gb2312":   "HZ-GB-2312",
+}
 
 // Supported returns whether charset `charset` is supported.
 func Supported(charset string) bool {

encoding/ghtml/ghtml.go

@@ -12,9 +12,10 @@ import (
 	"reflect"
 	"strings"
 
+	strip "github.com/grokify/html-strip-tags-go"
+
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
-	strip "github.com/grokify/html-strip-tags-go"
 )
 
 // StripTags strips HTML tags from content, and returns only text.

encoding/gurl/url.go

@@ -61,7 +61,7 @@ func ParseURL(str string, component int) (map[string]string, error) {
 	if component == -1 {
 		component = 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128
 	}
-	var components = make(map[string]string)
+	components := make(map[string]string)
 	if (component & 1) == 1 {
 		components["scheme"] = u.Scheme
 	}

errors/gerror/gerror_error.go

@@ -28,10 +28,8 @@ const (
 	stackFilterKeyLocal = "/errors/gerror/gerror"
 )
 
-var (
-	// goRootForFilter is used for stack filtering in development environment purpose.
-	goRootForFilter = runtime.GOROOT()
-)
+// goRootForFilter is used for stack filtering in development environment purpose.
+var goRootForFilter = runtime.GOROOT()
 
 func init() {
 	if goRootForFilter != "" {

errors/gerror/gerror_error_stack.go

@@ -101,7 +101,7 @@ func filterLinesOfStackInfos(infos []*stackInfo) {
 
 // formatStackInfos formats and returns error stack information as string.
 func formatStackInfos(infos []*stackInfo) string {
-	var buffer = bytes.NewBuffer(nil)
+	buffer := bytes.NewBuffer(nil)
 	for i, info := range infos {
 		buffer.WriteString(fmt.Sprintf("%d. %s\n", i+1, info.Message))
 		if info.Lines != nil && info.Lines.Len() > 0 {