add golangci feature to guarantee codes quality (#2229)

2025-04-05 03:05:05 +08:00 · 2022-11-01 20:12:21 +08:00 · 2022-11-01 20:12:21 +08:00 · 1793bf0863
commit 1793bf0863
parent 8e0e87877a
255 changed files with 1123 additions and 690 deletions
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@ -0,0 +1,50 @@
+# Tencent is pleased to support the open source community by making Polaris available.
+#
+# Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+#
+# Licensed under the BSD 3-Clause License (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://opensource.org/licenses/BSD-3-Clause
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+
+name: GolangCI-Lint
+on:
+  push:
+    branches:
+    - master
+    - develop
+    - personal/**
+    - feature/**
+    - enhance/**
+    - fix/**
+  pull_request:
+    branches:
+    - master
+    - develop
+    - personal/**
+    - feature/**
+    - enhance/**
+    - fix/**
+
+jobs:
+  golangci:
+    strategy:
+      matrix:
+        go-version: [1.15.x,1.16.x,1.17.x,1.18.x]
+    name: golangci-lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v3
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v3.3.0
+        with:
+          # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
+          version: latest
+          args: --timeout 3m0s
--- a/.golangci.yml
+++ b/.golangci.yml
@ -2,31 +2,57 @@
 ## with their default values.

 # See https://github.com/golangci/golangci-lint#config-file
-run:
-  issues-exit-code: 1 #Default
-  tests: true #Default
+# See https://golangci-lint.run/usage/configuration/

+# Options for analysis running.
+run:
+  # Exit code when at least one issue was found.
+  # Default: 1
+  issues-exit-code: 2
+
+  # Include test files or not.
+  # Default: true
+  tests: false
+
+  # Which dirs to skip: issues from them won't be reported.
+  # Can use regexp here: `generated.*`, regexp is applied on full path.
+  # Default value is empty list,
+  # but default dirs are skipped independently of this option's value (see skip-dirs-use-default).
+  # "/" will be replaced by current OS file path separator to properly work on Windows.
+  skip-dirs: []
+
+  # Which files to skip: they will be analyzed, but issues from them won't be reported.
+  # Default value is empty list,
+  # but there is no need to include all autogenerated files,
+  # we confidently recognize autogenerated files.
+  # If it's not please let us know.
+  # "/" will be replaced by current OS file path separator to properly work on Windows.
+  skip-files: []
+
+
+# Main linters configurations.
+# See https://golangci-lint.run/usage/linters
 linters:
-  # Disable everything by default so upgrades to not include new "default
-  # enabled" linters.
+  # Disable all default enabled linters.
  disable-all: true
-  # Specifically enable linters we want to use.
+  # Custom enable linters we want to use.
  enable:
-    - deadcode
-    - errcheck
-    - gofmt
-    - goimports
-    - gosimple
-    - govet
-    - godot
-    - ineffassign
-    - misspell
-    - revive
-    - staticcheck
-    - structcheck
-    - typecheck
-    - unused
-    - varcheck
+    - 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
+    - gci           # Gci controls golang 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
+    - nolintlint    # Reports ill-formed or insufficient nolint directives
+    - revive        # Fast, configurable, extensible, flexible, and beautiful linter for Go. Drop-in replacement of golint.
+    - staticcheck   # It's a set of rules from staticcheck. It's not the same thing as the staticcheck binary.
+    - typecheck     # Like the front-end of a Go compiler, parses and type-checks Go code
+    - usestdlibvars # A linter that detect the possibility to use variables/constants from the Go standard library.
+    - whitespace    # Tool for detection of leading and trailing whitespace


 issues:
@ -41,26 +67,240 @@ issues:
      text: "exported func.*returns unexported type.*which can be annoying to use"
      linters:
        - revive
+    # https://github.com/go-critic/go-critic/issues/926
+    - linters:
+        - gocritic
+      text: "unnecessaryDefer:"

+
+# https://golangci-lint.run/usage/linters
 linters-settings:
+  # https://golangci-lint.run/usage/linters/#misspell
  misspell:
    locale: US
    ignore-words:
      - cancelled
-  goimports:
-    local-prefixes: github.com/gogf/gf
-  godot:
-    # Comments to be checked: `declarations`, `toplevel`, or `all`.
-    # Default: declarations
-    scope: toplevel
-    exclude:
-      # Exclude sentence fragments for lists.
-      - '^[ ]*[-•]'
-      # Exclude sentences prefixing a list.
-      - ':$'
-    # Check that each sentence ends with a period.
-    # Default: true
-    period: false
-    # Check that each sentence starts with a capital letter.
+
+  # https://golangci-lint.run/usage/linters/#revive
+  # https://github.com/mgechev/revive/blob/master/RULES_DESCRIPTIONS.md
+  revive:
+    ignore-generated-header: true
+    severity: error
+    rules:
+      - name: atomic
+      - name: line-length-limit
+        severity: error
+        arguments: [ 380 ]
+      - name: unhandled-error
+        severity: warning
+        disabled: true
+        arguments: []
+      - name: var-naming
+        severity: warning
+        disabled: true
+        arguments:
+          # AllowList
+          - [ "ID","URL","IP","HTTP","JSON","API","UID","Id","Api","Uid","Http","Json","Ip","Url" ]
+          # DenyList
+          - [ "VM" ]
+      - name: string-format
+        severity: warning
+        disabled: false
+        arguments:
+          - - 'core.WriteError[1].Message'
+            - '/^([^A-Z]|$)/'
+            - must not start with a capital letter
+          - - 'fmt.Errorf[0]'
+            - '/(^|[^\.!?])$/'
+            - must not end in punctuation
+          - - panic
+            - '/^[^\n]*$/'
+            - must not contain line breaks
+      - name: function-result-limit
+        severity: warning
+        disabled: false
+        arguments: [ 4 ]
+
+  # https://golangci-lint.run/usage/linters/#funlen
+  funlen:
+    # Checks the number of lines in a function.
+    # If lower than 0, disable the check.
+    # Default: 60
+    lines: 330
+    # Checks the number of statements in a function.
+    # If lower than 0, disable the check.
+    # Default: 40
+    statements: -1
+
+  # https://golangci-lint.run/usage/linters/#goconst
+  goconst:
+    # Minimal length of string constant.
+    # Default: 3
+    min-len: 2
+    # Minimum occurrences of constant string count to trigger issue.
+    # Default: 3
+    # For subsequent optimization, the value is reduced.
+    min-occurrences: 30
+    # Ignore test files.
    # Default: false
-    capital: false
+    ignore-tests: true
+    # Look for existing constants matching the values.
+    # Default: true
+    match-constant: false
+    # Search also for duplicated numbers.
+    # Default: false
+    numbers: true
+    # Minimum value, only works with goconst.numbers
+    # Default: 3
+    min: 5
+    # Maximum value, only works with goconst.numbers
+    # Default: 3
+    max: 20
+    # Ignore when constant is not used as function argument.
+    # Default: true
+    ignore-calls: false
+
+  # https://golangci-lint.run/usage/linters/#gocritic
+  gocritic:
+    disabled-checks:
+      - ifElseChain
+      - assignOp
+      - appendAssign
+      - singleCaseSwitch
+      - regexpMust
+      - typeSwitchVar
+      - elseif
+
+  # https://golangci-lint.run/usage/linters/#gosimple
+  gosimple:
+    # Select the Go version to target.
+    # Default: 1.13
+    # Deprecated: use the global `run.go` instead.
+    go: "1.15"
+    # Sxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
+    # Default: ["*"]
+    checks: [
+      "all", "-S1000", "-S1001", "-S1002", "-S1008", "-S1009", "-S1016", "-S1023", "-S1025", "-S1029", "-S1034", "-S1040"
+    ]
+
+  # https://golangci-lint.run/usage/linters/#govet
+  govet:
+    # Report about shadowed variables.
+    # Default: false
+    check-shadowing: true
+    # Settings per analyzer.
+    settings:
+      # Analyzer name, run `go tool vet help` to see all analyzers.
+      printf:
+        # Comma-separated list of print function names to check (in addition to default, see `go tool vet help printf`).
+        # Default: []
+        funcs:
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Infof
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Warnf
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Errorf
+          - (github.com/golangci/golangci-lint/pkg/logutils.Log).Fatalf
+        # shadow:
+        # Whether to be strict about shadowing; can be noisy.
+        # Default: false
+        # strict: false
+      unusedresult:
+        # Comma-separated list of functions whose results must be used
+        # (in addition to defaults context.WithCancel,context.WithDeadline,context.WithTimeout,context.WithValue,
+        # errors.New,fmt.Errorf,fmt.Sprint,fmt.Sprintf,sort.Reverse)
+        # Default []
+        funcs:
+          - pkg.MyFunc
+          - context.WithCancel
+        # Comma-separated list of names of methods of type func() string whose results must be used
+        # (in addition to default Error,String)
+        # Default []
+        stringmethods:
+          - MyMethod
+    # Enable all analyzers.
+    # Default: false
+    enable-all: true
+    # Disable analyzers by name.
+    # Run `go tool vet help` to see all analyzers.
+    # Default: []
+    disable:
+      - asmdecl
+      - assign
+      - atomic
+      - atomicalign
+      - bools
+      - buildtag
+      - cgocall
+      - composites
+      - copylocks
+      - deepequalerrors
+      - errorsas
+      - fieldalignment
+      - findcall
+      - framepointer
+      - httpresponse
+      - ifaceassert
+      - loopclosure
+      - lostcancel
+      - nilfunc
+      - nilness
+      - reflectvaluecompare
+      - shift
+      - shadow
+      - sigchanyzer
+      - sortslice
+      - stdmethods
+      - stringintconv
+      - structtag
+      - testinggoroutine
+      - tests
+      - unmarshal
+      - unreachable
+      - unsafeptr
+      - unusedwrite
+
+  # https://golangci-lint.run/usage/linters/#staticcheck
+  staticcheck:
+    # Select the Go version to target.
+    # Default: "1.13"
+    # Deprecated: use the global `run.go` instead.
+    go: "1.15"
+    # SAxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
+    # 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:]'
+
+  #https://golangci-lint.run/usage/linters/#gci
+  gci:
+    # DEPRECATED: use `sections` and `prefix(github.com/org/project)` instead.
+    local-prefixes:
+    # 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`,
+    # If `custom-order` is `true`, it follows the order of `sections` option.
+    # Default: ["standard", "default"]
+    sections:
+      - standard # Standard section: captures all standard packages.
+      - default # Default section: contains all imports that could not be matched to another section type.
+      - prefix(github.com/gogf/gf) # Custom section: groups all imports with the specified Prefix.
+      - blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
+      - dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
+    # Skip generated files.
+    # Default: true
+    skip-generated: false
+    # Enable custom order of sections.
+    # If `true`, make the section order the same as the order of `sections`.
+    # Default: false
+    custom-order: true
--- a/3
+++ b/3
@ -11,3 +11,6 @@ tidy:
 		cd -; \
 	done

+.PHONY: lint
+lint:
+	golangci-lint run
--- a/cmd/gf/internal/cmd/cmd.go
+++ b/cmd/gf/internal/cmd/cmd.go
@ -4,11 +4,12 @@ import (
 	"context"
 	"strings"

-	"github.com/gogf/gf/cmd/gf/v2/internal/service"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/util/gtag"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/service"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 var (
@ -38,6 +39,7 @@ type cGFInput struct {
 	Version bool `short:"v" name:"version" brief:"show version information of current binary"   orphan:"true"`
 	Debug   bool `short:"d" name:"debug"   brief:"show internal detailed debugging information" orphan:"true"`
 }
+
 type cGFOutput struct{}

 func (c cGF) Index(ctx context.Context, in cGFInput) (out *cGFOutput, err error) {
--- a/cmd/gf/internal/cmd/cmd_build.go
+++ b/cmd/gf/internal/cmd/cmd_build.go
@ -9,7 +9,6 @@ import (
 	"runtime"
 	"strings"

-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/encoding/gbase64"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcmd"
@ -20,6 +19,8 @@ import (
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 var (
@ -124,6 +125,7 @@ type cBuildInput struct {
 	PackDst       string `short:"pd" name:"packDst" brief:"temporary go file path for pack, this go file will be automatically removed after built" d:"internal/packed/build_pack_data.go"`
 	ExitWhenError bool   `short:"ew" name:"exitWhenError" brief:"exit building when any error occurs, default is false" orphan:"true"`
 }
+
 type cBuildOutput struct{}

 func (c cBuild) Index(ctx context.Context, in cBuildInput) (out *cBuildOutput, err error) {
--- a/cmd/gf/internal/cmd/cmd_docker.go
+++ b/cmd/gf/internal/cmd/cmd_docker.go
@ -5,12 +5,13 @@ import (
 	"fmt"
 	"runtime"

-	"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/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 var (
@ -77,6 +78,7 @@ type cDockerInput struct {
 	Push        bool     `name:"push"        short:"p"  brief:"{cDockerPushBrief}" orphan:"true"`
 	Extra       string   `name:"extra"       short:"e"  brief:"{cDockerExtraBrief}"`
 }
+
 type cDockerOutput struct{}

 func (c cDocker) Index(ctx context.Context, in cDockerInput) (out *cDockerOutput, err error) {
--- a/cmd/gf/internal/cmd/cmd_env.go
+++ b/cmd/gf/internal/cmd/cmd_env.go
@ -4,12 +4,13 @@ import (
 	"bytes"
 	"context"

-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/olekukonko/tablewriter"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 var (
@ -23,6 +24,7 @@ type cEnv struct {
 type cEnvInput struct {
 	g.Meta `name:"env"`
 }
+
 type cEnvOutput struct{}

 func (c cEnv) Index(ctx context.Context, in cEnvInput) (out *cEnvOutput, err error) {
--- a/cmd/gf/internal/cmd/cmd_gen_dao.go
+++ b/cmd/gf/internal/cmd/cmd_gen_dao.go
@ -5,7 +5,6 @@ import (
 	_ "github.com/gogf/gf/contrib/drivers/mysql/v2"
 	_ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
 	_ "github.com/gogf/gf/contrib/drivers/sqlite/v2"
-	//_ "github.com/gogf/gf/contrib/drivers/oracle/v2"

 	"github.com/gogf/gf/cmd/gf/v2/internal/cmd/gendao"
 )
--- a/cmd/gf/internal/cmd/cmd_gen_pbentity.go
+++ b/cmd/gf/internal/cmd/cmd_gen_pbentity.go
@ -6,8 +6,6 @@ import (
 	"fmt"
 	"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/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
@ -17,6 +15,9 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/gtag"
 	"github.com/olekukonko/tablewriter"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 type (
--- a/cmd/gf/internal/cmd/cmd_init.go
+++ b/cmd/gf/internal/cmd/cmd_init.go
@ -5,14 +5,15 @@ import (
 	"fmt"
 	"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/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gproc"
 	"github.com/gogf/gf/v2/os/gres"
 	"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"
 )

 var (
@ -52,6 +53,7 @@ type cInitInput struct {
 	Mono   bool   `name:"mono"   short:"m" brief:"initialize a mono-repo instead a single-repo" orphan:"true"`
 	Update bool   `name:"update" short:"u" brief:"update to the latest goframe version" orphan:"true"`
 }
+
 type cInitOutput struct{}

 func (c cInit) Index(ctx context.Context, in cInitInput) (out *cInitOutput, err error) {
--- a/cmd/gf/internal/cmd/cmd_install.go
+++ b/cmd/gf/internal/cmd/cmd_install.go
@ -3,8 +3,9 @@ package cmd
 import (
 	"context"

-	"github.com/gogf/gf/cmd/gf/v2/internal/service"
 	"github.com/gogf/gf/v2/frame/g"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/service"
 )

 var (
@ -18,6 +19,7 @@ type cInstall struct {
 type cInstallInput struct {
 	g.Meta `name:"install"`
 }
+
 type cInstallOutput struct{}

 func (c cInstall) Index(ctx context.Context, in cInstallInput) (out *cInstallOutput, err error) {
--- a/cmd/gf/internal/cmd/cmd_pack.go
+++ b/cmd/gf/internal/cmd/cmd_pack.go
@ -4,13 +4,14 @@ import (
 	"context"
 	"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/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gres"
 	"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"
 )

 var (
@ -63,6 +64,7 @@ type cPackInput struct {
 	Prefix   string `name:"prefix"   short:"p" brief:"{cPackPrefixBrief}"`
 	KeepPath bool   `name:"keepPath" short:"k" brief:"{cPackKeepPathBrief}" orphan:"true"`
 }
+
 type cPackOutput struct{}

 func (c cPack) Index(ctx context.Context, in cPackInput) (out *cPackOutput, err error) {
--- a/cmd/gf/internal/cmd/cmd_run.go
+++ b/cmd/gf/internal/cmd/cmd_run.go
@ -5,7 +5,6 @@ import (
 	"fmt"
 	"runtime"

-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/container/gtype"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gfile"
@ -14,6 +13,8 @@ import (
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/os/gtimer"
 	"github.com/gogf/gf/v2/util/gtag"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 var (
--- a/cmd/gf/internal/cmd/cmd_tpl.go
+++ b/cmd/gf/internal/cmd/cmd_tpl.go
@ -3,7 +3,6 @@ package cmd
 import (
 	"context"

-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@ -11,6 +10,8 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
 	"github.com/gogf/gf/v2/util/gutil"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 var (
--- a/cmd/gf/internal/cmd/cmd_version.go
+++ b/cmd/gf/internal/cmd/cmd_version.go
@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"

-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@ -12,6 +11,8 @@ import (
 	"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"
 )

 var (
@ -25,6 +26,7 @@ type cVersion struct {
 type cVersionInput struct {
 	g.Meta `name:"version"`
 }
+
 type cVersionOutput struct{}

 func (c cVersion) Index(ctx context.Context, in cVersionInput) (*cVersionOutput, error) {
--- a/cmd/gf/internal/cmd/gendao/gendao.go
+++ b/cmd/gf/internal/cmd/gendao/gendao.go
@ -5,7 +5,6 @@ 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/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
@ -14,6 +13,8 @@ import (
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gtag"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 const (
--- a/cmd/gf/internal/cmd/gendao/gendao_clear.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_clear.go
@ -3,9 +3,10 @@ package gendao
 import (
 	"context"

+	"github.com/gogf/gf/v2/os/gfile"
+
 	"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/os/gfile"
 )

 func doClear(ctx context.Context, dirPath string) {
--- a/cmd/gf/internal/cmd/gendao/gendao_dao.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_dao.go
@ -6,15 +6,16 @@ import (
 	"fmt"
 	"strings"

-	"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/database/gdb"
 	"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/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/cmd/gf/v2/internal/utility/utils"
 )

 func generateDao(ctx context.Context, in CGenDaoInternalInput) {
--- a/cmd/gf/internal/cmd/gendao/gendao_do.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_do.go
@ -5,13 +5,14 @@ import (
 	"fmt"
 	"strings"

-	"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/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"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )

 func generateDo(ctx context.Context, in CGenDaoInternalInput) {
--- a/cmd/gf/internal/cmd/gendao/gendao_entity.go
+++ b/cmd/gf/internal/cmd/gendao/gendao_entity.go
@ -4,12 +4,13 @@ import (
 	"context"
 	"strings"

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

 func generateEntity(ctx context.Context, in CGenDaoInternalInput) {
--- a/cmd/gf/internal/cmd/genservice/genservice.go
+++ b/cmd/gf/internal/cmd/genservice/genservice.go
@ -4,8 +4,6 @@ import (
 	"context"
 	"fmt"

-	"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/garray"
 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
@ -16,6 +14,9 @@ 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/utility/mlog"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )

 const (
--- a/cmd/gf/internal/cmd/genservice/genservice_generate.go
+++ b/cmd/gf/internal/cmd/genservice/genservice_generate.go
@ -3,14 +3,15 @@ package genservice
 import (
 	"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/garray"
 	"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"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/utils"
 )

 type generateServiceFilesInput struct {
--- a/cmd/gf/internal/service/install.go
+++ b/cmd/gf/internal/service/install.go
@ -5,8 +5,6 @@ import (
 	"runtime"
 	"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/v2/container/garray"
 	"github.com/gogf/gf/v2/container/gset"
 	"github.com/gogf/gf/v2/frame/g"
@ -15,6 +13,9 @@ import (
 	"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/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 var (
--- a/cmd/gf/internal/utility/utils/utils.go
+++ b/cmd/gf/internal/utility/utils/utils.go
@ -1,11 +1,12 @@
 package utils

 import (
-	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
 	"golang.org/x/tools/imports"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/consts"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 // GoFmt formats the source file and adds or removes import statements as necessary.
--- a/cmd/gf/main.go
+++ b/cmd/gf/main.go
@ -2,16 +2,17 @@ package main

 import (
 	_ "github.com/gogf/gf/cmd/gf/v2/internal/packed"
+
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcfg"
-
-	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
-	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 	"github.com/gogf/gf/v2/os/gcmd"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/text/gstr"
+
+	"github.com/gogf/gf/cmd/gf/v2/internal/cmd"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/allyes"
+	"github.com/gogf/gf/cmd/gf/v2/internal/utility/mlog"
 )

 const (
--- a/container/garray/garray_z_unit_sorted_str_test.go
+++ b/container/garray/garray_z_unit_sorted_str_test.go
@ -9,7 +9,6 @@
 package garray_test

 import (
-	"github.com/gogf/gf/v2/text/gstr"
 	"testing"
 	"time"

@ -17,6 +16,7 @@ import (
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 )

--- a/container/glist/glist.go
+++ b/container/glist/glist.go
@ -407,7 +407,6 @@ func (l *List) Removes(es []*Element) {
 	for _, e := range es {
 		l.list.Remove(e)
 	}
-	return
 }

 // RemoveAll removes all elements from list `l`.
--- a/container/gmap/gmap_hash_any_any_map.go
+++ b/container/gmap/gmap_hash_any_any_map.go
@ -157,7 +157,7 @@ func (m *AnyAnyMap) Search(key interface{}) (value interface{}, found bool) {
 func (m *AnyAnyMap) Get(key interface{}) (value interface{}) {
 	m.mu.RLock()
 	if m.data != nil {
-		value, _ = m.data[key]
+		value = m.data[key]
 	}
 	m.mu.RUnlock()
 	return
--- a/container/gmap/gmap_hash_int_any_map.go
+++ b/container/gmap/gmap_hash_int_any_map.go
@ -157,7 +157,7 @@ func (m *IntAnyMap) Search(key int) (value interface{}, found bool) {
 func (m *IntAnyMap) Get(key int) (value interface{}) {
 	m.mu.RLock()
 	if m.data != nil {
-		value, _ = m.data[key]
+		value = m.data[key]
 	}
 	m.mu.RUnlock()
 	return
--- a/container/gmap/gmap_hash_int_int_map.go
+++ b/container/gmap/gmap_hash_int_int_map.go
@ -143,7 +143,7 @@ func (m *IntIntMap) Search(key int) (value int, found bool) {
 func (m *IntIntMap) Get(key int) (value int) {
 	m.mu.RLock()
 	if m.data != nil {
-		value, _ = m.data[key]
+		value = m.data[key]
 	}
 	m.mu.RUnlock()
 	return
--- a/container/gmap/gmap_hash_int_str_map.go
+++ b/container/gmap/gmap_hash_int_str_map.go
@ -143,7 +143,7 @@ func (m *IntStrMap) Search(key int) (value string, found bool) {
 func (m *IntStrMap) Get(key int) (value string) {
 	m.mu.RLock()
 	if m.data != nil {
-		value, _ = m.data[key]
+		value = m.data[key]
 	}
 	m.mu.RUnlock()
 	return
--- a/container/gmap/gmap_hash_str_any_map.go
+++ b/container/gmap/gmap_hash_str_any_map.go
@ -152,7 +152,7 @@ func (m *StrAnyMap) Search(key string) (value interface{}, found bool) {
 func (m *StrAnyMap) Get(key string) (value interface{}) {
 	m.mu.RLock()
 	if m.data != nil {
-		value, _ = m.data[key]
+		value = m.data[key]
 	}
 	m.mu.RUnlock()
 	return
--- a/container/gmap/gmap_hash_str_int_map.go
+++ b/container/gmap/gmap_hash_str_int_map.go
@ -144,7 +144,7 @@ func (m *StrIntMap) Search(key string) (value int, found bool) {
 func (m *StrIntMap) Get(key string) (value int) {
 	m.mu.RLock()
 	if m.data != nil {
-		value, _ = m.data[key]
+		value = m.data[key]
 	}
 	m.mu.RUnlock()
 	return
--- a/container/gmap/gmap_hash_str_str_map.go
+++ b/container/gmap/gmap_hash_str_str_map.go
@ -144,7 +144,7 @@ func (m *StrStrMap) Search(key string) (value string, found bool) {
 func (m *StrStrMap) Get(key string) (value string) {
 	m.mu.RLock()
 	if m.data != nil {
-		value, _ = m.data[key]
+		value = m.data[key]
 	}
 	m.mu.RUnlock()
 	return
--- a/container/gmap/gmap_z_basic_test.go
+++ b/container/gmap/gmap_z_basic_test.go
@ -101,6 +101,7 @@ func Test_Map_Basic(t *testing.T) {
 		t.Assert(m2.Map(), map[interface{}]interface{}{1: 1, "key1": "val1"})
 	})
 }
+
 func Test_Map_Set_Fun(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m := gmap.New()
@ -123,6 +124,7 @@ func Test_Map_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[interface{}]interface{}{"key2": "val2", "key3": "val3"})
 	})
 }
+
 func Test_Map_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[interface{}]interface{}{1: 1, "key1": "val1"}
@ -175,6 +177,7 @@ func Test_Map_Clone(t *testing.T) {
 		t.AssertIN("key1", m.Keys())
 	})
 }
+
 func Test_Map_Basic_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.New()
--- a/container/gmap/gmap_z_bench_maps_test.go
+++ b/container/gmap/gmap_z_bench_maps_test.go
@ -16,7 +16,9 @@ import (
 )

 var hashMap = gmap.New(true)
+
 var listMap = gmap.NewListMap(true)
+
 var treeMap = gmap.NewTreeMap(gutil.ComparatorInt, true)

 func Benchmark_HashMap_Set(b *testing.B) {
--- a/container/gmap/gmap_z_bench_safe_test.go
+++ b/container/gmap/gmap_z_bench_safe_test.go
@ -16,11 +16,17 @@ import (
 )

 var anyAnyMap = gmap.NewAnyAnyMap(true)
+
 var intIntMap = gmap.NewIntIntMap(true)
+
 var intAnyMap = gmap.NewIntAnyMap(true)
+
 var intStrMap = gmap.NewIntStrMap(true)
+
 var strIntMap = gmap.NewStrIntMap(true)
+
 var strAnyMap = gmap.NewStrAnyMap(true)
+
 var strStrMap = gmap.NewStrStrMap(true)

 func Benchmark_IntIntMap_Set(b *testing.B) {
--- a/container/gmap/gmap_z_bench_syncmap_test.go
+++ b/container/gmap/gmap_z_bench_syncmap_test.go
@ -16,6 +16,7 @@ import (
 )

 var gm = gmap.NewIntIntMap(true)
+
 var sm = sync.Map{}

 func Benchmark_GMapSet(b *testing.B) {
--- a/container/gmap/gmap_z_bench_unsafe_test.go
+++ b/container/gmap/gmap_z_bench_unsafe_test.go
@ -16,11 +16,17 @@ import (
 )

 var anyAnyMapUnsafe = gmap.New()
+
 var intIntMapUnsafe = gmap.NewIntIntMap()
+
 var intAnyMapUnsafe = gmap.NewIntAnyMap()
+
 var intStrMapUnsafe = gmap.NewIntStrMap()
+
 var strIntMapUnsafe = gmap.NewStrIntMap()
+
 var strAnyMapUnsafe = gmap.NewStrAnyMap()
+
 var strStrMapUnsafe = gmap.NewStrStrMap()

 // Writing benchmarks.
--- a/container/gmap/gmap_z_example_any_any_test.go
+++ b/container/gmap/gmap_z_example_any_any_test.go
@ -8,11 +8,11 @@ package gmap_test

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/internal/json"
-	"github.com/gogf/gf/v2/util/gconv"

 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/json"
+	"github.com/gogf/gf/v2/util/gconv"
 )

 func ExampleAnyAnyMap_Iterator() {
--- a/container/gmap/gmap_z_example_int_any_test.go
+++ b/container/gmap/gmap_z_example_int_any_test.go
@ -8,6 +8,7 @@ package gmap_test

 import (
 	"fmt"
+
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
--- a/container/gmap/gmap_z_example_int_int_test.go
+++ b/container/gmap/gmap_z_example_int_int_test.go
@ -8,6 +8,7 @@ package gmap_test

 import (
 	"fmt"
+
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
--- a/container/gmap/gmap_z_example_str_any_test.go
+++ b/container/gmap/gmap_z_example_str_any_test.go
@ -8,11 +8,11 @@ package gmap_test

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/internal/json"
-	"github.com/gogf/gf/v2/util/gconv"

 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/json"
+	"github.com/gogf/gf/v2/util/gconv"
 )

 func ExampleStrAnyMap_Iterator() {
--- a/container/gmap/gmap_z_example_str_int_test.go
+++ b/container/gmap/gmap_z_example_str_int_test.go
@ -8,6 +8,7 @@ package gmap_test

 import (
 	"fmt"
+
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/internal/json"
--- a/container/gmap/gmap_z_example_str_str_test.go
+++ b/container/gmap/gmap_z_example_str_str_test.go
@ -8,12 +8,11 @@ package gmap_test

 import (
 	"fmt"
-	"github.com/gogf/gf/v2/internal/json"
-
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gconv"

 	"github.com/gogf/gf/v2/container/gmap"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/internal/json"
+	"github.com/gogf/gf/v2/util/gconv"
 )

 func ExampleStrStrMap_Iterator() {
--- a/container/gmap/gmap_z_example_test.go
+++ b/container/gmap/gmap_z_example_test.go
@ -9,9 +9,8 @@ package gmap_test
 import (
 	"fmt"

-	"github.com/gogf/gf/v2/util/gutil"
-
 	"github.com/gogf/gf/v2/container/gmap"
+	"github.com/gogf/gf/v2/util/gutil"
 )

 func ExampleNew() {
--- a/container/gmap/gmap_z_unit_hash_int_any_test.go
+++ b/container/gmap/gmap_z_unit_hash_int_any_test.go
@ -117,6 +117,7 @@ func Test_IntAnyMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[int]interface{}{3: 3})
 	})
 }
+
 func Test_IntAnyMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[int]interface{}{1: 1, 2: "2"}
@ -154,6 +155,7 @@ func Test_IntAnyMap_Lock(t *testing.T) {
 		})
 	})
 }
+
 func Test_IntAnyMap_Clone(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		// clone 方法是深克隆
@ -169,6 +171,7 @@ func Test_IntAnyMap_Clone(t *testing.T) {
 		t.AssertIN(2, m.Keys())
 	})
 }
+
 func Test_IntAnyMap_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.NewIntAnyMap()
--- a/container/gmap/gmap_z_unit_hash_int_str_test.go
+++ b/container/gmap/gmap_z_unit_hash_int_str_test.go
@ -152,6 +152,7 @@ func Test_IntStrMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[int]interface{}{3: "c"})
 	})
 }
+
 func Test_IntStrMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[int]string{1: "a", 2: "b"}
@ -204,6 +205,7 @@ func Test_IntStrMap_Clone(t *testing.T) {
 		t.AssertIN(2, m.Keys())
 	})
 }
+
 func Test_IntStrMap_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.NewIntStrMap()
--- a/container/gmap/gmap_z_unit_hash_str_any_test.go
+++ b/container/gmap/gmap_z_unit_hash_str_any_test.go
@ -146,6 +146,7 @@ func Test_StrAnyMap_Lock(t *testing.T) {
 		})
 	})
 }
+
 func Test_StrAnyMap_Clone(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		// clone 方法是深克隆
@ -161,6 +162,7 @@ func Test_StrAnyMap_Clone(t *testing.T) {
 		t.AssertIN("b", m.Keys())
 	})
 }
+
 func Test_StrAnyMap_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.NewStrAnyMap()
--- a/container/gmap/gmap_z_unit_hash_str_int_test.go
+++ b/container/gmap/gmap_z_unit_hash_str_int_test.go
@ -117,6 +117,7 @@ func Test_StrIntMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[string]int{"c": 3})
 	})
 }
+
 func Test_StrIntMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[string]int{"a": 1, "b": 2}
@ -170,6 +171,7 @@ func Test_StrIntMap_Clone(t *testing.T) {
 		t.AssertIN("b", m.Keys())
 	})
 }
+
 func Test_StrIntMap_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.NewStrIntMap()
--- a/container/gmap/gmap_z_unit_hash_str_str_test.go
+++ b/container/gmap/gmap_z_unit_hash_str_str_test.go
@ -116,6 +116,7 @@ func Test_StrStrMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[string]string{"c": "c"})
 	})
 }
+
 func Test_StrStrMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[string]string{"a": "a", "b": "b"}
@ -153,6 +154,7 @@ func Test_StrStrMap_Lock(t *testing.T) {
 		})
 	})
 }
+
 func Test_StrStrMap_Clone(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		// clone 方法是深克隆
@ -168,6 +170,7 @@ func Test_StrStrMap_Clone(t *testing.T) {
 		t.AssertIN("b", m.Keys())
 	})
 }
+
 func Test_StrStrMap_Merge(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		m1 := gmap.NewStrStrMap()
--- a/container/gmap/gmap_z_unit_list_map_test.go
+++ b/container/gmap/gmap_z_unit_list_map_test.go
@ -106,6 +106,7 @@ func Test_ListMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[interface{}]interface{}{"key2": "val2", "key3": "val3"})
 	})
 }
+
 func Test_ListMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[interface{}]interface{}{1: 1, "key1": "val1"}
--- a/container/gmap/gmap_z_unit_tree_map_test.go
+++ b/container/gmap/gmap_z_unit_tree_map_test.go
@ -107,6 +107,7 @@ func Test_TreeMap_Batch(t *testing.T) {
 		t.Assert(m.Map(), map[interface{}]interface{}{"key2": "val2", "key3": "val3"})
 	})
 }
+
 func Test_TreeMap_Iterator(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		expect := map[interface{}]interface{}{1: 1, "key1": "val1"}
--- a/container/gpool/gpool.go
+++ b/container/gpool/gpool.go
@ -97,7 +97,6 @@ func (p *Pool) Clear() {
 	} else {
 		p.list.RemoveAll()
 	}
-
 }

 // Get picks and returns an item from pool. If the pool is empty and NewFunc is defined,
--- a/container/gpool/gpool_bench_test.go
+++ b/container/gpool/gpool_bench_test.go
@ -17,6 +17,7 @@ import (
 )

 var pool = gpool.New(time.Hour, nil)
+
 var syncp = sync.Pool{}

 func BenchmarkGPoolPut(b *testing.B) {
--- a/container/gpool/gpool_z_example_test.go
+++ b/container/gpool/gpool_z_example_test.go
@ -9,8 +9,9 @@ package gpool_test
 import (
 	"database/sql"
 	"fmt"
-	"github.com/gogf/gf/v2/container/gpool"
 	"time"
+
+	"github.com/gogf/gf/v2/container/gpool"
 )

 func ExampleNew() {
--- a/container/gpool/gpool_z_unit_test.go
+++ b/container/gpool/gpool_z_unit_test.go
@ -21,6 +21,7 @@ var nf gpool.NewFunc = func() (i interface{}, e error) {
 }

 var assertIndex int = 0
+
 var ef gpool.ExpireFunc = func(i interface{}) {
 	assertIndex++
 	gtest.Assert(i, assertIndex)
--- a/container/gqueue/gqueue.go
+++ b/container/gqueue/gqueue.go
@ -15,7 +15,6 @@
 // 3. Support dynamic queue size(unlimited queue size);
 //
 // 4. Blocking when reading data from queue;
-//
 package gqueue

 import (
--- a/container/gqueue/gqueue_z_bench_test.go
+++ b/container/gqueue/gqueue_z_bench_test.go
@ -15,9 +15,13 @@ import (
 )

 var bn = 20000000
+
 var length = 1000000
+
 var qstatic = gqueue.New(length)
+
 var qdynamic = gqueue.New()
+
 var cany = make(chan interface{}, length)

 func Benchmark_Gqueue_StaticPushAndPop(b *testing.B) {
--- a/container/gring/gring.go
+++ b/container/gring/gring.go
@ -153,7 +153,6 @@ func (r *Ring) Next() *Ring {
 // them creates a single ring with the elements of s inserted
 // after r. The result points to the element following the
 // last element of s after insertion.
-//
 func (r *Ring) Link(s *Ring) *Ring {
 	r.mu.Lock()
 	s.mu.Lock()
@ -168,7 +167,6 @@ func (r *Ring) Link(s *Ring) *Ring {
 // Unlink removes n % r.Len() elements from the ring r, starting
 // at r.Next(). If n % r.Len() == 0, r remains unchanged.
 // The result is the removed sub-ring. r must not be empty.
-//
 func (r *Ring) Unlink(n int) *Ring {
 	r.mu.Lock()
 	resultRing := r.ring.Unlink(n)
--- a/container/gring/gring_z_bench_test.go
+++ b/container/gring/gring_z_bench_test.go
@ -15,6 +15,7 @@ import (
 )

 var length = 10000
+
 var ringObject = gring.New(length, true)

 func BenchmarkRing_Put(b *testing.B) {
--- a/container/gring/gring_z_unit_test.go
+++ b/container/gring/gring_z_unit_test.go
@ -43,6 +43,7 @@ func TestRing_Val(t *testing.T) {
 		r.Set(&Student{3, "jack", true})
 	})
 }
+
 func TestRing_CapLen(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		r := gring.New(10)
--- a/container/gset/gset_any_set.go
+++ b/container/gset/gset_any_set.go
@ -55,7 +55,7 @@ func NewFrom(items interface{}, safe ...bool) *Set {
 func (set *Set) Iterator(f func(v interface{}) bool) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k, _ := range set.data {
+	for k := range set.data {
 		if !f(k) {
 			break
 		}
@ -211,7 +211,7 @@ func (set *Set) Join(glue string) string {
 		i      = 0
 		buffer = bytes.NewBuffer(nil)
 	)
-	for k, _ := range set.data {
+	for k := range set.data {
 		buffer.WriteString(gconv.String(k))
 		if i != l-1 {
 			buffer.WriteString(glue)
@ -229,13 +229,13 @@ func (set *Set) String() string {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
 	var (
-		s      = ""
+		s      string
 		l      = len(set.data)
 		i      = 0
 		buffer = bytes.NewBuffer(nil)
 	)
 	buffer.WriteByte('[')
-	for k, _ := range set.data {
+	for k := range set.data {
 		s = gconv.String(k)
 		if gstr.IsNumeric(s) {
 			buffer.WriteString(s)
@ -416,7 +416,7 @@ func (set *Set) Merge(others ...*Set) *Set {
 func (set *Set) Sum() (sum int) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k, _ := range set.data {
+	for k := range set.data {
 		sum += gconv.Int(k)
 	}
 	return
@ -426,7 +426,7 @@ func (set *Set) Sum() (sum int) {
 func (set *Set) Pop() interface{} {
 	set.mu.Lock()
 	defer set.mu.Unlock()
-	for k, _ := range set.data {
+	for k := range set.data {
 		delete(set.data, k)
 		return k
 	}
@ -446,7 +446,7 @@ func (set *Set) Pops(size int) []interface{} {
 	}
 	index := 0
 	array := make([]interface{}, size)
-	for k, _ := range set.data {
+	for k := range set.data {
 		delete(set.data, k)
 		array[index] = k
 		index++
@ -519,7 +519,7 @@ func (set *Set) DeepCopy() interface{} {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
 	data := make([]interface{}, 0)
-	for k, _ := range set.data {
+	for k := range set.data {
 		data = append(data, k)
 	}
 	return NewFrom(data, set.mu.IsSafe())
--- a/container/gset/gset_int_set.go
+++ b/container/gset/gset_int_set.go
@ -47,7 +47,7 @@ func NewIntSetFrom(items []int, safe ...bool) *IntSet {
 func (set *IntSet) Iterator(f func(v int) bool) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k, _ := range set.data {
+	for k := range set.data {
 		if !f(k) {
 			break
 		}
@ -172,7 +172,7 @@ func (set *IntSet) Slice() []int {
 		i   = 0
 		ret = make([]int, len(set.data))
 	)
-	for k, _ := range set.data {
+	for k := range set.data {
 		ret[i] = k
 		i++
 	}
@ -192,7 +192,7 @@ func (set *IntSet) Join(glue string) string {
 		i      = 0
 		buffer = bytes.NewBuffer(nil)
 	)
-	for k, _ := range set.data {
+	for k := range set.data {
 		buffer.WriteString(gconv.String(k))
 		if i != l-1 {
 			buffer.WriteString(glue)
@ -375,7 +375,7 @@ func (set *IntSet) Merge(others ...*IntSet) *IntSet {
 func (set *IntSet) Sum() (sum int) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k, _ := range set.data {
+	for k := range set.data {
 		sum += k
 	}
 	return
@ -385,7 +385,7 @@ func (set *IntSet) Sum() (sum int) {
 func (set *IntSet) Pop() int {
 	set.mu.Lock()
 	defer set.mu.Unlock()
-	for k, _ := range set.data {
+	for k := range set.data {
 		delete(set.data, k)
 		return k
 	}
@ -405,7 +405,7 @@ func (set *IntSet) Pops(size int) []int {
 	}
 	index := 0
 	array := make([]int, size)
-	for k, _ := range set.data {
+	for k := range set.data {
 		delete(set.data, k)
 		array[index] = k
 		index++
--- a/container/gset/gset_str_set.go
+++ b/container/gset/gset_str_set.go
@ -49,7 +49,7 @@ func NewStrSetFrom(items []string, safe ...bool) *StrSet {
 func (set *StrSet) Iterator(f func(v string) bool) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k, _ := range set.data {
+	for k := range set.data {
 		if !f(k) {
 			break
 		}
@ -146,7 +146,7 @@ func (set *StrSet) Contains(item string) bool {
 func (set *StrSet) ContainsI(item string) bool {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k, _ := range set.data {
+	for k := range set.data {
 		if strings.EqualFold(k, item) {
 			return true
 		}
@ -206,7 +206,7 @@ func (set *StrSet) Join(glue string) string {
 		i      = 0
 		buffer = bytes.NewBuffer(nil)
 	)
-	for k, _ := range set.data {
+	for k := range set.data {
 		buffer.WriteString(k)
 		if i != l-1 {
 			buffer.WriteString(glue)
@ -229,7 +229,7 @@ func (set *StrSet) String() string {
 		buffer = bytes.NewBuffer(nil)
 	)
 	buffer.WriteByte('[')
-	for k, _ := range set.data {
+	for k := range set.data {
 		buffer.WriteString(`"` + gstr.QuoteMeta(k, `"\`) + `"`)
 		if i != l-1 {
 			buffer.WriteByte(',')
@ -405,7 +405,7 @@ func (set *StrSet) Merge(others ...*StrSet) *StrSet {
 func (set *StrSet) Sum() (sum int) {
 	set.mu.RLock()
 	defer set.mu.RUnlock()
-	for k, _ := range set.data {
+	for k := range set.data {
 		sum += gconv.Int(k)
 	}
 	return
@ -415,7 +415,7 @@ func (set *StrSet) Sum() (sum int) {
 func (set *StrSet) Pop() string {
 	set.mu.Lock()
 	defer set.mu.Unlock()
-	for k, _ := range set.data {
+	for k := range set.data {
 		delete(set.data, k)
 		return k
 	}
@ -435,7 +435,7 @@ func (set *StrSet) Pops(size int) []string {
 	}
 	index := 0
 	array := make([]string, size)
-	for k, _ := range set.data {
+	for k := range set.data {
 		delete(set.data, k)
 		array[index] = k
 		index++
--- a/container/gset/gset_z_bench_test.go
+++ b/container/gset/gset_z_bench_test.go
@ -16,10 +16,15 @@ import (
 )

 var intSet = gset.NewIntSet(true)
+
 var anySet = gset.NewSet(true)
+
 var strSet = gset.NewStrSet(true)
+
 var intSetUnsafe = gset.NewIntSet()
+
 var anySetUnsafe = gset.NewSet()
+
 var strSetUnsafe = gset.NewStrSet()

 func Benchmark_IntSet_Add(b *testing.B) {
--- a/container/gtree/gtree_z_avl_tree_test.go
+++ b/container/gtree/gtree_z_avl_tree_test.go
@ -56,6 +56,7 @@ func Test_AVLTree_Basic(t *testing.T) {
 		t.Assert(m2.Map(), map[interface{}]interface{}{1: 1, "key1": "val1"})
 	})
 }
+
 func Test_AVLTree_Set_Fun(t *testing.T) {
 	//GetOrSetFunc lock or unlock
 	gtest.C(t, func(t *gtest.T) {
--- a/container/gtree/gtree_z_example_avltree_test.go
+++ b/container/gtree/gtree_z_example_avltree_test.go
@ -8,6 +8,7 @@ package gtree_test

 import (
 	"fmt"
+
 	"github.com/gogf/gf/v2/container/gtree"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/util/gconv"
--- a/container/gtree/gtree_z_example_btree_test.go
+++ b/container/gtree/gtree_z_example_btree_test.go
@ -8,6 +8,7 @@ package gtree_test

 import (
 	"fmt"
+
 	"github.com/gogf/gf/v2/container/gtree"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/util/gconv"
--- a/container/gtree/gtree_z_example_redblacktree_test.go
+++ b/container/gtree/gtree_z_example_redblacktree_test.go
@ -8,6 +8,7 @@ package gtree_test

 import (
 	"fmt"
+
 	"github.com/gogf/gf/v2/container/gtree"
 	"github.com/gogf/gf/v2/internal/json"
 	"github.com/gogf/gf/v2/util/gconv"
--- a/container/gtree/gtree_z_example_test.go
+++ b/container/gtree/gtree_z_example_test.go
@ -8,6 +8,7 @@ package gtree_test

 import (
 	"fmt"
+
 	"github.com/gogf/gf/v2/container/gtree"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/gutil"
--- a/container/gtype/gtype_z_unit_uint64_test.go
+++ b/container/gtype/gtype_z_unit_uint64_test.go
@ -58,6 +58,7 @@ func Test_Uint64(t *testing.T) {
 		t.AssertNil(copyVal)
 	})
 }
+
 func Test_Uint64_JSON(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		i := gtype.NewUint64(math.MaxUint64)
--- a/container/gvar/gvar_z_unit_basic_test.go
+++ b/container/gvar/gvar_z_unit_basic_test.go
@ -55,6 +55,7 @@ func Test_Val(t *testing.T) {
 		t.Assert(objOne.Val(), nil)
 	})
 }
+
 func Test_Interface(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		objOne := gvar.New(1, true)
@ -66,6 +67,7 @@ func Test_Interface(t *testing.T) {
 		t.Assert(objTwoOld, 1)
 	})
 }
+
 func Test_IsNil(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		objOne := gvar.New(nil, true)
@ -102,6 +104,7 @@ func Test_String(t *testing.T) {

 	})
 }
+
 func Test_Bool(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var ok bool = true
@ -204,6 +207,7 @@ func Test_Uint64(t *testing.T) {

 	})
 }
+
 func Test_Float32(t *testing.T) {
 	gtest.C(t, func(t *gtest.T) {
 		var num float32 = 1.1
--- a/contrib/config/apollo/apollo.go
+++ b/contrib/config/apollo/apollo.go
@ -13,7 +13,6 @@ import (
 	"github.com/apolloconfig/agollo/v4"
 	apolloConfig "github.com/apolloconfig/agollo/v4/env/config"
 	"github.com/apolloconfig/agollo/v4/storage"
-
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
--- a/contrib/config/apollo/apollo_test.go
+++ b/contrib/config/apollo/apollo_test.go
@ -9,11 +9,12 @@ package apollo_test
 import (
 	"testing"

-	"github.com/gogf/gf/contrib/config/apollo/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/apollo/v2"
 )

 var (
--- a/contrib/config/nacos/nacos.go
+++ b/contrib/config/nacos/nacos.go
@ -10,15 +10,14 @@ package nacos
 import (
 	"context"

-	"github.com/nacos-group/nacos-sdk-go/clients"
-	"github.com/nacos-group/nacos-sdk-go/clients/config_client"
-	"github.com/nacos-group/nacos-sdk-go/common/constant"
-	"github.com/nacos-group/nacos-sdk-go/vo"
-
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcfg"
+	"github.com/nacos-group/nacos-sdk-go/clients"
+	"github.com/nacos-group/nacos-sdk-go/clients/config_client"
+	"github.com/nacos-group/nacos-sdk-go/common/constant"
+	"github.com/nacos-group/nacos-sdk-go/vo"
 )

 // Config is the configuration object for nacos client.
--- a/contrib/config/nacos/nacos_test.go
+++ b/contrib/config/nacos/nacos_test.go
@ -9,13 +9,14 @@ package nacos_test
 import (
 	"testing"

-	"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/nacos-group/nacos-sdk-go/common/constant"
 	"github.com/nacos-group/nacos-sdk-go/vo"
+
+	"github.com/gogf/gf/contrib/config/nacos/v2"
 )

 var (
--- a/contrib/config/polaris/polaris.go
+++ b/contrib/config/polaris/polaris.go
@ -10,15 +10,14 @@ package polaris
 import (
 	"context"

-	"github.com/polarismesh/polaris-go"
-	"github.com/polarismesh/polaris-go/api"
-	"github.com/polarismesh/polaris-go/pkg/model"
-
 	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gcfg"
 	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/polarismesh/polaris-go"
+	"github.com/polarismesh/polaris-go/api"
+	"github.com/polarismesh/polaris-go/pkg/model"
 )

 // LogDir sets the log directory for polaris.
--- a/contrib/drivers/clickhouse/clickhouse.go
+++ b/contrib/drivers/clickhouse/clickhouse.go
@ -18,17 +18,16 @@ import (
 	"time"

 	"github.com/ClickHouse/clickhouse-go/v2"
+	"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/util/gutil"
-	"github.com/google/uuid"
-	"github.com/shopspring/decimal"
-
-	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/os/gctx"
 	"github.com/gogf/gf/v2/os/gtime"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/google/uuid"
+	"github.com/shopspring/decimal"
 )

 // Driver is the driver for postgresql database.
--- a/contrib/drivers/clickhouse/clickhouse_test.go
+++ b/contrib/drivers/clickhouse/clickhouse_test.go
@ -12,9 +12,6 @@ import (
 	"testing"
 	"time"

-	"github.com/google/uuid"
-	"github.com/shopspring/decimal"
-
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gtime"
@ -22,6 +19,8 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/grand"
 	"github.com/gogf/gf/v2/util/guid"
+	"github.com/google/uuid"
+	"github.com/shopspring/decimal"
 )

 const (
--- a/contrib/drivers/mssql/mssql.go
+++ b/contrib/drivers/mssql/mssql.go
@ -20,13 +20,12 @@ import (
 	"strings"

 	_ "github.com/denisenkom/go-mssqldb"
-	"github.com/gogf/gf/v2/util/gutil"
-
 	"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/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gutil"
 )

 // Driver is the driver for SQL server database.
--- a/contrib/drivers/mssql/mssql_z_model_test.go
+++ b/contrib/drivers/mssql/mssql_z_model_test.go
@ -9,6 +9,9 @@ package mssql_test
 import (
 	"database/sql"
 	"fmt"
+	"testing"
+	"time"
+
 	"github.com/gogf/gf/v2/container/garray"
 	"github.com/gogf/gf/v2/container/gmap"
 	"github.com/gogf/gf/v2/database/gdb"
@ -17,8 +20,6 @@ import (
 	"github.com/gogf/gf/v2/test/gtest"
 	"github.com/gogf/gf/v2/util/guid"
 	"github.com/gogf/gf/v2/util/gutil"
-	"testing"
-	"time"
 )

 func TestPage(t *testing.T) {
--- a/contrib/drivers/mysql/mysql.go
+++ b/contrib/drivers/mysql/mysql.go
@ -14,13 +14,12 @@ import (
 	"net/url"

 	_ "github.com/go-sql-driver/mysql"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/util/gutil"
-
 	"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/frame/g"
 	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v2/util/gutil"
 )

 // Driver is the driver for mysql database.
--- a/contrib/drivers/mysql/mysql_basic_test.go
+++ b/contrib/drivers/mysql/mysql_basic_test.go
@ -11,7 +11,6 @@ import (
 	"testing"

 	"github.com/go-sql-driver/mysql"
-
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/test/gtest"
 )
--- a/contrib/drivers/pgsql/pgsql.go
+++ b/contrib/drivers/pgsql/pgsql.go
@ -17,8 +17,6 @@ import (
 	"fmt"
 	"strings"

-	_ "github.com/lib/pq"
-
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
@ -27,6 +25,7 @@ import (
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/gutil"
+	_ "github.com/lib/pq"
 )

 // Driver is the driver for postgresql database.
--- a/contrib/drivers/pgsql/pgsql_z_init_test.go
+++ b/contrib/drivers/pgsql/pgsql_z_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"
--- a/contrib/drivers/pgsql/pgsql_z_test.go
+++ b/contrib/drivers/pgsql/pgsql_z_test.go
@ -9,10 +9,11 @@ package pgsql_test
 import (
 	"testing"

-	"github.com/gogf/gf/contrib/drivers/pgsql/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/contrib/drivers/pgsql/v2"
 )

 func Test_LastInsertId(t *testing.T) {
--- a/contrib/drivers/sqlite/sqlite.go
+++ b/contrib/drivers/sqlite/sqlite.go
@ -18,8 +18,6 @@ import (
 	"strings"

 	_ "github.com/glebarez/go-sqlite"
-	"github.com/gogf/gf/v2/util/gutil"
-
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/encoding/gurl"
 	"github.com/gogf/gf/v2/errors/gcode"
@ -27,6 +25,7 @@ import (
 	"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/v2/util/gutil"
 )

 // Driver is the driver for sqlite database.
--- a/contrib/drivers/sqlite/sqlite_core_test.go
+++ b/contrib/drivers/sqlite/sqlite_core_test.go
@ -774,6 +774,7 @@ func Test_DB_Time(t *testing.T) {
 		t.Assert(n, 2)
 	})
 }
+
 func Test_DB_ToJson(t *testing.T) {
 	table := createInitTable()
 	defer dropTable(table)
--- a/contrib/registry/etcd/etcd.go
+++ b/contrib/registry/etcd/etcd.go
@ -11,14 +11,13 @@ import (
 	"reflect"
 	"time"

-	etcd3 "go.etcd.io/etcd/client/v3"
-
 	"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/net/gsvc"
 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/gogf/gf/v2/text/gstr"
+	etcd3 "go.etcd.io/etcd/client/v3"
 )

 var (
--- a/contrib/registry/etcd/etcd_discovery.go
+++ b/contrib/registry/etcd/etcd_discovery.go
@ -9,9 +9,8 @@ package etcd
 import (
 	"context"

-	etcd3 "go.etcd.io/etcd/client/v3"
-
 	"github.com/gogf/gf/v2/net/gsvc"
+	etcd3 "go.etcd.io/etcd/client/v3"
 )

 // Search is the etcd discovery search function.
--- a/contrib/registry/etcd/etcd_registrar.go
+++ b/contrib/registry/etcd/etcd_registrar.go
@ -9,10 +9,9 @@ package etcd
 import (
 	"context"

-	etcd3 "go.etcd.io/etcd/client/v3"
-
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/net/gsvc"
+	etcd3 "go.etcd.io/etcd/client/v3"
 )

 // Register implements the gsvc.Register interface.
--- a/contrib/registry/etcd/etcd_watcher.go
+++ b/contrib/registry/etcd/etcd_watcher.go
@ -9,9 +9,8 @@ package etcd
 import (
 	"context"

-	etcd3 "go.etcd.io/etcd/client/v3"
-
 	"github.com/gogf/gf/v2/net/gsvc"
+	etcd3 "go.etcd.io/etcd/client/v3"
 )

 var (
--- a/contrib/registry/polaris/polaris.go
+++ b/contrib/registry/polaris/polaris.go
@ -10,12 +10,11 @@ package polaris
 import (
 	"time"

-	"github.com/polarismesh/polaris-go"
-	"github.com/polarismesh/polaris-go/pkg/config"
-
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/os/glog"
+	"github.com/polarismesh/polaris-go"
+	"github.com/polarismesh/polaris-go/pkg/config"
 )

 var (
--- a/contrib/registry/polaris/polaris_discovery.go
+++ b/contrib/registry/polaris/polaris_discovery.go
@ -11,11 +11,10 @@ import (
 	"fmt"
 	"strings"

-	"github.com/polarismesh/polaris-go"
-	"github.com/polarismesh/polaris-go/pkg/model"
-
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/polarismesh/polaris-go"
+	"github.com/polarismesh/polaris-go/pkg/model"
 )

 // Search returns the service instances in memory according to the service name.
--- a/contrib/registry/polaris/polaris_registrar.go
+++ b/contrib/registry/polaris/polaris_registrar.go
@ -10,12 +10,11 @@ import (
 	"context"
 	"time"

-	"github.com/polarismesh/polaris-go"
-	"github.com/polarismesh/polaris-go/pkg/model"
-
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/text/gstr"
 	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/polarismesh/polaris-go"
+	"github.com/polarismesh/polaris-go/pkg/model"
 )

 // Register the registration.
--- a/contrib/registry/polaris/polaris_watcher.go
+++ b/contrib/registry/polaris/polaris_watcher.go
@ -9,10 +9,9 @@ package polaris
 import (
 	"context"

+	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/polarismesh/polaris-go"
 	"github.com/polarismesh/polaris-go/pkg/model"
-
-	"github.com/gogf/gf/v2/net/gsvc"
 )

 // Watcher is a service watcher.
--- a/contrib/registry/polaris/polaris_z_test.go
+++ b/contrib/registry/polaris/polaris_z_test.go
@ -11,11 +11,10 @@ import (
 	"testing"
 	"time"

-	"github.com/polarismesh/polaris-go/pkg/config"
-
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/net/gsvc"
 	"github.com/gogf/gf/v2/os/gctx"
+	"github.com/polarismesh/polaris-go/pkg/config"
 )

 // TestRegistry TestRegistryManyService
--- a/contrib/trace/jaeger/jaeger.go
+++ b/contrib/trace/jaeger/jaeger.go
@ -3,17 +3,16 @@ package jaeger
 import (
 	"strings"

+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
+	"github.com/gogf/gf/v2/net/gipv4"
+	"github.com/gogf/gf/v2/text/gregex"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 	"go.opentelemetry.io/otel/exporters/jaeger"
 	"go.opentelemetry.io/otel/sdk/resource"
 	"go.opentelemetry.io/otel/sdk/trace"
 	semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
-
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/net/gipv4"
-	"github.com/gogf/gf/v2/text/gregex"
 )

 const (
--- a/database/gdb/gdb_core.go
+++ b/database/gdb/gdb_core.go
@ -546,7 +546,7 @@ func (c *Core) DoUpdate(ctx context.Context, link Link, table string, data inter
 	}
 	var (
 		params  []interface{}
-		updates = ""
+		updates string
 	)
 	switch kind {
 	case reflect.Map, reflect.Struct:
--- a/Show More
+++ b/Show More