diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
new file mode 100644
index 000000000..39b629fc9
--- /dev/null
+++ 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
diff --git a/.golangci.yml b/.golangci.yml
index af6a88165..158f4e0c8 100644
--- 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
\ No newline at end of file
+ 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
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 65b060a3c..49629ed09 100644
--- a/Makefile
+++ b/Makefile
@@ -11,3 +11,6 @@ tidy:
cd -; \
done
+.PHONY: lint
+lint:
+ golangci-lint run
\ No newline at end of file
diff --git a/cmd/gf/internal/cmd/cmd.go b/cmd/gf/internal/cmd/cmd.go
index 844346a10..342929fcc 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/cmd_build.go b/cmd/gf/internal/cmd/cmd_build.go
index 5a72e4d76..29cc8660c 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/cmd_docker.go b/cmd/gf/internal/cmd/cmd_docker.go
index 12b1be1c6..aed888385 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/cmd_env.go b/cmd/gf/internal/cmd/cmd_env.go
index a38819501..2a5f6e0d2 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/cmd_gen_dao.go b/cmd/gf/internal/cmd/cmd_gen_dao.go
index f805350b6..f472f2a7a 100644
--- 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"
)
diff --git a/cmd/gf/internal/cmd/cmd_gen_pbentity.go b/cmd/gf/internal/cmd/cmd_gen_pbentity.go
index a87d3f9ba..f0f44a4ca 100644
--- 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 (
diff --git a/cmd/gf/internal/cmd/cmd_init.go b/cmd/gf/internal/cmd/cmd_init.go
index ac2472756..8d0a0f224 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/cmd_install.go b/cmd/gf/internal/cmd/cmd_install.go
index 159294e96..7f9040a80 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/cmd_pack.go b/cmd/gf/internal/cmd/cmd_pack.go
index c60c8e6ea..2b63f02f9 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/cmd_run.go b/cmd/gf/internal/cmd/cmd_run.go
index 627db22fd..2b766db40 100644
--- 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 (
diff --git a/cmd/gf/internal/cmd/cmd_tpl.go b/cmd/gf/internal/cmd/cmd_tpl.go
index 845561333..cf568c82d 100644
--- 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 (
diff --git a/cmd/gf/internal/cmd/cmd_version.go b/cmd/gf/internal/cmd/cmd_version.go
index 5a44eac47..feec2a6bd 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/gendao/gendao.go b/cmd/gf/internal/cmd/gendao/gendao.go
index fd1dc38f7..4d1dfaf2c 100644
--- 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 (
diff --git a/cmd/gf/internal/cmd/gendao/gendao_clear.go b/cmd/gf/internal/cmd/gendao/gendao_clear.go
index eb0a49c98..9cc7a7823 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/gendao/gendao_dao.go b/cmd/gf/internal/cmd/gendao/gendao_dao.go
index 016bfca45..392385451 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/gendao/gendao_do.go b/cmd/gf/internal/cmd/gendao/gendao_do.go
index 2b9ab4ad8..7da4fda96 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/gendao/gendao_entity.go b/cmd/gf/internal/cmd/gendao/gendao_entity.go
index fa99e7ac5..e5afcc86a 100644
--- 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) {
diff --git a/cmd/gf/internal/cmd/genservice/genservice.go b/cmd/gf/internal/cmd/genservice/genservice.go
index 6974b2241..1049fe8c4 100644
--- 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 (
diff --git a/cmd/gf/internal/cmd/genservice/genservice_generate.go b/cmd/gf/internal/cmd/genservice/genservice_generate.go
index 43e22aab0..9314eb97d 100644
--- 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 {
diff --git a/cmd/gf/internal/service/install.go b/cmd/gf/internal/service/install.go
index 60957e278..6dc79b91e 100644
--- 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 (
diff --git a/cmd/gf/internal/utility/utils/utils.go b/cmd/gf/internal/utility/utils/utils.go
index 087cc43f2..fa164679a 100644
--- 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.
diff --git a/cmd/gf/main.go b/cmd/gf/main.go
index 0746b50b8..e948fe59a 100644
--- 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 (
diff --git a/container/garray/garray_z_unit_sorted_str_test.go b/container/garray/garray_z_unit_sorted_str_test.go
index d64005334..65972d056 100644
--- 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"
)
diff --git a/container/glist/glist.go b/container/glist/glist.go
index 95958eaed..1c6212eae 100644
--- 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`.
diff --git a/container/gmap/gmap_hash_any_any_map.go b/container/gmap/gmap_hash_any_any_map.go
index 60e8ef408..23ce00124 100644
--- 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
diff --git a/container/gmap/gmap_hash_int_any_map.go b/container/gmap/gmap_hash_int_any_map.go
index 291c6c37c..209cf19b3 100644
--- 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
diff --git a/container/gmap/gmap_hash_int_int_map.go b/container/gmap/gmap_hash_int_int_map.go
index 4b336d002..9404b081f 100644
--- 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
diff --git a/container/gmap/gmap_hash_int_str_map.go b/container/gmap/gmap_hash_int_str_map.go
index 92b8de8a6..e327a889d 100644
--- 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
diff --git a/container/gmap/gmap_hash_str_any_map.go b/container/gmap/gmap_hash_str_any_map.go
index 88ec164f4..29bdc121d 100644
--- 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
diff --git a/container/gmap/gmap_hash_str_int_map.go b/container/gmap/gmap_hash_str_int_map.go
index 0f3ef5d7b..13bb275d8 100644
--- 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
diff --git a/container/gmap/gmap_hash_str_str_map.go b/container/gmap/gmap_hash_str_str_map.go
index 595f5bfa7..0128fe385 100644
--- 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
diff --git a/container/gmap/gmap_z_basic_test.go b/container/gmap/gmap_z_basic_test.go
index 55182170f..2bc7013a9 100644
--- 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()
diff --git a/container/gmap/gmap_z_bench_maps_test.go b/container/gmap/gmap_z_bench_maps_test.go
index 79ab77c7f..62e56c6b6 100644
--- 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) {
diff --git a/container/gmap/gmap_z_bench_safe_test.go b/container/gmap/gmap_z_bench_safe_test.go
index b1baa5d3f..9700a66bb 100644
--- 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) {
diff --git a/container/gmap/gmap_z_bench_syncmap_test.go b/container/gmap/gmap_z_bench_syncmap_test.go
index e2799d815..20f814a85 100644
--- 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) {
diff --git a/container/gmap/gmap_z_bench_unsafe_test.go b/container/gmap/gmap_z_bench_unsafe_test.go
index e07e289cd..c7f971f22 100644
--- 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.
diff --git a/container/gmap/gmap_z_example_any_any_test.go b/container/gmap/gmap_z_example_any_any_test.go
index 7238189f6..67c032649 100644
--- 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() {
diff --git a/container/gmap/gmap_z_example_int_any_test.go b/container/gmap/gmap_z_example_int_any_test.go
index e2344269e..92f7418b6 100644
--- 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"
diff --git a/container/gmap/gmap_z_example_int_int_test.go b/container/gmap/gmap_z_example_int_int_test.go
index 6398571ff..fff14d922 100644
--- 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"
diff --git a/container/gmap/gmap_z_example_str_any_test.go b/container/gmap/gmap_z_example_str_any_test.go
index 4f6dcc351..a71adaaab 100644
--- 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() {
diff --git a/container/gmap/gmap_z_example_str_int_test.go b/container/gmap/gmap_z_example_str_int_test.go
index 0ba38a946..304e683c8 100644
--- 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"
diff --git a/container/gmap/gmap_z_example_str_str_test.go b/container/gmap/gmap_z_example_str_str_test.go
index 17451fecb..e0849c1c4 100644
--- 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() {
diff --git a/container/gmap/gmap_z_example_test.go b/container/gmap/gmap_z_example_test.go
index 165c371b2..0acee4ab9 100644
--- 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() {
diff --git a/container/gmap/gmap_z_unit_hash_int_any_test.go b/container/gmap/gmap_z_unit_hash_int_any_test.go
index 143e311d0..199e976fc 100644
--- 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()
diff --git a/container/gmap/gmap_z_unit_hash_int_str_test.go b/container/gmap/gmap_z_unit_hash_int_str_test.go
index 4b34abf05..938d09bf6 100644
--- 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()
diff --git a/container/gmap/gmap_z_unit_hash_str_any_test.go b/container/gmap/gmap_z_unit_hash_str_any_test.go
index 2f9e2a25c..4853afc0c 100644
--- 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()
diff --git a/container/gmap/gmap_z_unit_hash_str_int_test.go b/container/gmap/gmap_z_unit_hash_str_int_test.go
index 86a18acd5..2c11031bb 100644
--- 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()
diff --git a/container/gmap/gmap_z_unit_hash_str_str_test.go b/container/gmap/gmap_z_unit_hash_str_str_test.go
index e228cca8f..c129e3ea8 100644
--- 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()
diff --git a/container/gmap/gmap_z_unit_list_map_test.go b/container/gmap/gmap_z_unit_list_map_test.go
index 90315cf7f..e1fe7099b 100644
--- 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"}
diff --git a/container/gmap/gmap_z_unit_tree_map_test.go b/container/gmap/gmap_z_unit_tree_map_test.go
index fd3341e46..67807b474 100644
--- 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"}
diff --git a/container/gpool/gpool.go b/container/gpool/gpool.go
index f96986301..9ec3f2cee 100644
--- 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,
diff --git a/container/gpool/gpool_bench_test.go b/container/gpool/gpool_bench_test.go
index 059d63629..2079adbdc 100644
--- 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) {
diff --git a/container/gpool/gpool_z_example_test.go b/container/gpool/gpool_z_example_test.go
index 0018b3a7e..1c0b8373e 100644
--- 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() {
diff --git a/container/gpool/gpool_z_unit_test.go b/container/gpool/gpool_z_unit_test.go
index c7dca3388..dfd000dd0 100644
--- 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)
diff --git a/container/gqueue/gqueue.go b/container/gqueue/gqueue.go
index a778709b3..f90fc7cea 100644
--- 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 (
diff --git a/container/gqueue/gqueue_z_bench_test.go b/container/gqueue/gqueue_z_bench_test.go
index ce720f5d7..897b54d05 100644
--- 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) {
diff --git a/container/gring/gring.go b/container/gring/gring.go
index 9a06d576a..160fbf553 100644
--- 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)
diff --git a/container/gring/gring_z_bench_test.go b/container/gring/gring_z_bench_test.go
index ea204adff..46b6c6c51 100644
--- 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) {
diff --git a/container/gring/gring_z_unit_test.go b/container/gring/gring_z_unit_test.go
index 6d972de63..002bd5f94 100644
--- 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)
diff --git a/container/gset/gset_any_set.go b/container/gset/gset_any_set.go
index 03807efbf..28f2e3941 100644
--- 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())
diff --git a/container/gset/gset_int_set.go b/container/gset/gset_int_set.go
index 3c741ef23..aa5b0da6e 100644
--- 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++
diff --git a/container/gset/gset_str_set.go b/container/gset/gset_str_set.go
index 3b6f4381a..10b603096 100644
--- 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++
diff --git a/container/gset/gset_z_bench_test.go b/container/gset/gset_z_bench_test.go
index 03802064a..53fb5610d 100644
--- 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) {
diff --git a/container/gtree/gtree_z_avl_tree_test.go b/container/gtree/gtree_z_avl_tree_test.go
index 960dd28cd..c46afa899 100644
--- 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) {
diff --git a/container/gtree/gtree_z_example_avltree_test.go b/container/gtree/gtree_z_example_avltree_test.go
index 1b10c24f5..58cb5641f 100644
--- 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"
diff --git a/container/gtree/gtree_z_example_btree_test.go b/container/gtree/gtree_z_example_btree_test.go
index 9bd3df40a..fb5a551a2 100644
--- 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"
diff --git a/container/gtree/gtree_z_example_redblacktree_test.go b/container/gtree/gtree_z_example_redblacktree_test.go
index 46a39c6d1..552b6232d 100644
--- 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"
diff --git a/container/gtree/gtree_z_example_test.go b/container/gtree/gtree_z_example_test.go
index 499b6ab65..410fbcf2a 100644
--- 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"
diff --git a/container/gtype/gtype_z_unit_uint64_test.go b/container/gtype/gtype_z_unit_uint64_test.go
index 4718ac458..1cf407984 100644
--- 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)
diff --git a/container/gvar/gvar_z_unit_basic_test.go b/container/gvar/gvar_z_unit_basic_test.go
index a7a7417d7..80f930865 100644
--- 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
diff --git a/contrib/config/apollo/apollo.go b/contrib/config/apollo/apollo.go
index 3c967c775..21b8cb800 100644
--- 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"
diff --git a/contrib/config/apollo/apollo_test.go b/contrib/config/apollo/apollo_test.go
index ee0210223..37b79c18d 100644
--- 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 (
diff --git a/contrib/config/nacos/nacos.go b/contrib/config/nacos/nacos.go
index 4b41a4e2f..e0319bfe9 100644
--- 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.
diff --git a/contrib/config/nacos/nacos_test.go b/contrib/config/nacos/nacos_test.go
index c8c1d6547..0548f6011 100644
--- 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 (
diff --git a/contrib/config/polaris/polaris.go b/contrib/config/polaris/polaris.go
index b121e9d60..6944bc291 100644
--- 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.
diff --git a/contrib/drivers/clickhouse/clickhouse.go b/contrib/drivers/clickhouse/clickhouse.go
index 9b0b548ed..966130a56 100644
--- 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.
diff --git a/contrib/drivers/clickhouse/clickhouse_test.go b/contrib/drivers/clickhouse/clickhouse_test.go
index e04714544..b9a2867ba 100644
--- 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 (
diff --git a/contrib/drivers/mssql/mssql.go b/contrib/drivers/mssql/mssql.go
index a107df499..536ce64a1 100644
--- 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.
diff --git a/contrib/drivers/mssql/mssql_z_model_test.go b/contrib/drivers/mssql/mssql_z_model_test.go
index 93fc26bd0..962e88120 100644
--- 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) {
diff --git a/contrib/drivers/mysql/mysql.go b/contrib/drivers/mysql/mysql.go
index 622d227cf..41ff15e77 100644
--- 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.
diff --git a/contrib/drivers/mysql/mysql_basic_test.go b/contrib/drivers/mysql/mysql_basic_test.go
index bec900e5b..6e028ae8b 100644
--- 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"
)
diff --git a/contrib/drivers/pgsql/pgsql.go b/contrib/drivers/pgsql/pgsql.go
index 5ea31c53a..9654caab3 100644
--- 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.
diff --git a/contrib/drivers/pgsql/pgsql_z_init_test.go b/contrib/drivers/pgsql/pgsql_z_init_test.go
index 6ea57983b..8e67af502 100644
--- 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"
diff --git a/contrib/drivers/pgsql/pgsql_z_test.go b/contrib/drivers/pgsql/pgsql_z_test.go
index 0d139582d..f5559d989 100644
--- 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) {
diff --git a/contrib/drivers/sqlite/sqlite.go b/contrib/drivers/sqlite/sqlite.go
index 03f7d77fb..36aa7f951 100644
--- 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.
diff --git a/contrib/drivers/sqlite/sqlite_core_test.go b/contrib/drivers/sqlite/sqlite_core_test.go
index ee934e65e..45c9600a0 100644
--- 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)
diff --git a/contrib/registry/etcd/etcd.go b/contrib/registry/etcd/etcd.go
index c0d7128ea..5201c355d 100644
--- 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 (
diff --git a/contrib/registry/etcd/etcd_discovery.go b/contrib/registry/etcd/etcd_discovery.go
index 7821271f4..862515176 100644
--- 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.
diff --git a/contrib/registry/etcd/etcd_registrar.go b/contrib/registry/etcd/etcd_registrar.go
index cd6051b1f..62b3d310e 100644
--- 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.
diff --git a/contrib/registry/etcd/etcd_watcher.go b/contrib/registry/etcd/etcd_watcher.go
index 6d482ada4..fe401ba90 100644
--- 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 (
diff --git a/contrib/registry/polaris/polaris.go b/contrib/registry/polaris/polaris.go
index 00f1e99fe..c903e4dc9 100644
--- 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 (
diff --git a/contrib/registry/polaris/polaris_discovery.go b/contrib/registry/polaris/polaris_discovery.go
index e6bd21c07..d5b85a6be 100644
--- 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.
diff --git a/contrib/registry/polaris/polaris_registrar.go b/contrib/registry/polaris/polaris_registrar.go
index 0741f0d64..56f760a4c 100644
--- 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.
diff --git a/contrib/registry/polaris/polaris_watcher.go b/contrib/registry/polaris/polaris_watcher.go
index bf2ae5574..8cfa9d325 100644
--- 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.
diff --git a/contrib/registry/polaris/polaris_z_test.go b/contrib/registry/polaris/polaris_z_test.go
index 12e857055..2aee2854f 100644
--- 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
diff --git a/contrib/trace/jaeger/jaeger.go b/contrib/trace/jaeger/jaeger.go
index 17176edfc..656d20b08 100644
--- 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 (
diff --git a/database/gdb/gdb_core.go b/database/gdb/gdb_core.go
index 23672f91a..3ab6815f1 100644
--- 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:
diff --git a/database/gdb/gdb_core_ctx.go b/database/gdb/gdb_core_ctx.go
index e9d39d0a0..9d138f01d 100644
--- a/database/gdb/gdb_core_ctx.go
+++ b/database/gdb/gdb_core_ctx.go
@@ -59,8 +59,5 @@ func (c *Core) InjectIgnoreResult(ctx context.Context) context.Context {
}
func (c *Core) GetIgnoreResultFromCtx(ctx context.Context) bool {
- if ctx.Value(ignoreResultKeyInCtx) != nil {
- return true
- }
- return false
+ return ctx.Value(ignoreResultKeyInCtx) != nil
}
diff --git a/database/gdb/gdb_core_trace.go b/database/gdb/gdb_core_trace.go
index 2d6e7b75d..12e06050b 100644
--- a/database/gdb/gdb_core_trace.go
+++ b/database/gdb/gdb_core_trace.go
@@ -13,7 +13,7 @@ import (
"go.opentelemetry.io/otel/attribute"
"go.opentelemetry.io/otel/codes"
- "go.opentelemetry.io/otel/semconv/v1.4.0"
+ semconv "go.opentelemetry.io/otel/semconv/v1.4.0"
"go.opentelemetry.io/otel/trace"
"github.com/gogf/gf/v2/net/gtrace"
diff --git a/database/gdb/gdb_core_utility.go b/database/gdb/gdb_core_utility.go
index f8ebad934..8550fb68b 100644
--- a/database/gdb/gdb_core_utility.go
+++ b/database/gdb/gdb_core_utility.go
@@ -225,7 +225,7 @@ func (c *Core) guessPrimaryTableName(tableStr string) string {
return ""
}
var (
- guessedTableName = ""
+ guessedTableName string
array1 = gstr.SplitAndTrim(tableStr, ",")
array2 = gstr.SplitAndTrim(array1[0], " ")
array3 = gstr.SplitAndTrim(array2[0], ".")
diff --git a/database/gdb/gdb_func.go b/database/gdb/gdb_func.go
index b459d89fc..fa174cf26 100644
--- a/database/gdb/gdb_func.go
+++ b/database/gdb/gdb_func.go
@@ -233,7 +233,7 @@ func DataToMapDeep(value interface{}) map[string]interface{} {
// nothing to the table name, or else adds the prefix to the table name and returns new table name with prefix.
func doQuoteTableName(table, prefix, charLeft, charRight string) string {
var (
- index = 0
+ index int
chars = charLeft + charRight
array1 = gstr.SplitAndTrim(table, ",")
)
diff --git a/database/gdb/gdb_model.go b/database/gdb/gdb_model.go
index 4ddcf0dc9..b08f8fc53 100644
--- a/database/gdb/gdb_model.go
+++ b/database/gdb/gdb_model.go
@@ -72,15 +72,15 @@ const (
// Model creates and returns a new ORM model from given schema.
// The parameter `tableNameQueryOrStruct` can be more than one table names, and also alias name, like:
-// 1. Model names:
-// db.Model("user")
-// db.Model("user u")
-// db.Model("user, user_detail")
-// db.Model("user u, user_detail ud")
-// 2. Model name with alias:
-// db.Model("user", "u")
-// 3. Model name with sub-query:
-// db.Model("? AS a, ? AS b", subQuery1, subQuery2)
+// 1. Model names:
+// db.Model("user")
+// db.Model("user u")
+// db.Model("user, user_detail")
+// db.Model("user u, user_detail ud")
+// 2. Model name with alias:
+// db.Model("user", "u")
+// 3. Model name with sub-query:
+// db.Model("? AS a, ? AS b", subQuery1, subQuery2)
func (c *Core) Model(tableNameQueryOrStruct ...interface{}) *Model {
var (
ctx = c.db.GetCtx()
@@ -143,7 +143,8 @@ func (c *Core) Model(tableNameQueryOrStruct ...interface{}) *Model {
// Raw creates and returns a model based on a raw sql not a table.
// Example:
-// db.Raw("SELECT * FROM `user` WHERE `name` = ?", "john").Scan(&result)
+//
+// db.Raw("SELECT * FROM `user` WHERE `name` = ?", "john").Scan(&result)
func (c *Core) Raw(rawSql string, args ...interface{}) *Model {
model := c.Model()
model.rawSql = rawSql
@@ -153,7 +154,9 @@ func (c *Core) Raw(rawSql string, args ...interface{}) *Model {
// Raw sets current model as a raw sql model.
// Example:
-// db.Raw("SELECT * FROM `user` WHERE `name` = ?", "john").Scan(&result)
+//
+// db.Raw("SELECT * FROM `user` WHERE `name` = ?", "john").Scan(&result)
+//
// See Core.Raw.
func (m *Model) Raw(rawSql string, args ...interface{}) *Model {
model := m.db.Raw(rawSql, args...)
diff --git a/database/gdb/gdb_model_insert.go b/database/gdb/gdb_model_insert.go
index 950758a67..4414c616c 100644
--- a/database/gdb/gdb_model_insert.go
+++ b/database/gdb/gdb_model_insert.go
@@ -139,14 +139,17 @@ func (m *Model) Data(data ...interface{}) *Model {
// In MySQL, this is used for "ON DUPLICATE KEY UPDATE" statement.
// The parameter `onDuplicate` can be type of string/Raw/*Raw/map/slice.
// Example:
+//
// OnDuplicate("nickname, age")
// OnDuplicate("nickname", "age")
-// OnDuplicate(g.Map{
-// "nickname": gdb.Raw("CONCAT('name_', VALUES(`nickname`))"),
-// })
-// OnDuplicate(g.Map{
-// "nickname": "passport",
-// }).
+//
+// OnDuplicate(g.Map{
+// "nickname": gdb.Raw("CONCAT('name_', VALUES(`nickname`))"),
+// })
+//
+// OnDuplicate(g.Map{
+// "nickname": "passport",
+// }).
func (m *Model) OnDuplicate(onDuplicate ...interface{}) *Model {
model := m.getModel()
if len(onDuplicate) > 1 {
@@ -161,12 +164,14 @@ func (m *Model) OnDuplicate(onDuplicate ...interface{}) *Model {
// In MySQL, this is used for "ON DUPLICATE KEY UPDATE" statement.
// The parameter `onDuplicateEx` can be type of string/map/slice.
// Example:
+//
// OnDuplicateEx("passport, password")
// OnDuplicateEx("passport", "password")
-// OnDuplicateEx(g.Map{
-// "passport": "",
-// "password": "",
-// }).
+//
+// OnDuplicateEx(g.Map{
+// "passport": "",
+// "password": "",
+// }).
func (m *Model) OnDuplicateEx(onDuplicateEx ...interface{}) *Model {
model := m.getModel()
if len(onDuplicateEx) > 1 {
diff --git a/database/gdb/gdb_model_option.go b/database/gdb/gdb_model_option.go
index f7520b3e9..1565cedf2 100644
--- a/database/gdb/gdb_model_option.go
+++ b/database/gdb/gdb_model_option.go
@@ -29,10 +29,11 @@ func (m *Model) OmitEmpty() *Model {
// the Where/Having parameters for `empty` values.
//
// Eg:
-// Where("id", []int{}).All() -> SELECT xxx FROM xxx WHERE 0=1
-// Where("name", "").All() -> SELECT xxx FROM xxx WHERE `name`=''
-// OmitEmpty().Where("id", []int{}).All() -> SELECT xxx FROM xxx
-// OmitEmpty().("name", "").All() -> SELECT xxx FROM xxx.
+//
+// Where("id", []int{}).All() -> SELECT xxx FROM xxx WHERE 0=1
+// Where("name", "").All() -> SELECT xxx FROM xxx WHERE `name`=''
+// OmitEmpty().Where("id", []int{}).All() -> SELECT xxx FROM xxx
+// OmitEmpty().("name", "").All() -> SELECT xxx FROM xxx.
func (m *Model) OmitEmptyWhere() *Model {
model := m.getModel()
model.option = model.option | optionOmitEmptyWhere
diff --git a/database/gdb/gdb_model_select.go b/database/gdb/gdb_model_select.go
index 721924389..345ff4776 100644
--- a/database/gdb/gdb_model_select.go
+++ b/database/gdb/gdb_model_select.go
@@ -117,7 +117,7 @@ func (m *Model) Chunk(size int, handler ChunkHandler) {
if len(data) == 0 {
break
}
- if handler(data, err) == false {
+ if !handler(data, err) {
break
}
if len(data) < size {
diff --git a/database/gdb/gdb_model_time.go b/database/gdb/gdb_model_time.go
index 34ff11566..9d7a536e6 100644
--- a/database/gdb/gdb_model_time.go
+++ b/database/gdb/gdb_model_time.go
@@ -150,8 +150,8 @@ func (m *Model) getConditionForSoftDeleting() string {
// getConditionOfTableStringForSoftDeleting does something as its name describes.
func (m *Model) getConditionOfTableStringForSoftDeleting(s string) string {
var (
- field = ""
- table = ""
+ field string
+ table string
array1 = gstr.SplitAndTrim(s, " ")
array2 = gstr.SplitAndTrim(array1[0], ".")
)
diff --git a/database/gdb/gdb_model_with.go b/database/gdb/gdb_model_with.go
index b6fa46452..b52f04022 100644
--- a/database/gdb/gdb_model_with.go
+++ b/database/gdb/gdb_model_with.go
@@ -23,19 +23,26 @@ import (
// It can be called multiple times to add one or more objects to model and enable
// their mode association operations feature.
// For example, if given struct definition:
-// type User struct {
-// gmeta.Meta `orm:"table:user"`
-// Id int `json:"id"`
-// Name string `json:"name"`
-// UserDetail *UserDetail `orm:"with:uid=id"`
-// UserScores []*UserScores `orm:"with:uid=id"`
-// }
+//
+// type User struct {
+// gmeta.Meta `orm:"table:user"`
+// Id int `json:"id"`
+// Name string `json:"name"`
+// UserDetail *UserDetail `orm:"with:uid=id"`
+// UserScores []*UserScores `orm:"with:uid=id"`
+// }
+//
// We can enable model association operations on attribute `UserDetail` and `UserScores` by:
-// db.With(User{}.UserDetail).With(User{}.UserDetail).Scan(xxx)
+//
+// db.With(User{}.UserDetail).With(User{}.UserDetail).Scan(xxx)
+//
// Or:
-// db.With(UserDetail{}).With(UserDetail{}).Scan(xxx)
+//
+// db.With(UserDetail{}).With(UserDetail{}).Scan(xxx)
+//
// Or:
-// db.With(UserDetail{}, UserDetail{}).Scan(xxx)
+//
+// db.With(UserDetail{}, UserDetail{}).Scan(xxx)
func (m *Model) With(objects ...interface{}) *Model {
model := m.getModel()
for _, object := range objects {
diff --git a/database/gdb/gdb_statement.go b/database/gdb/gdb_statement.go
index 89ffb752e..4ba93581c 100644
--- a/database/gdb/gdb_statement.go
+++ b/database/gdb/gdb_statement.go
@@ -106,8 +106,8 @@ func (s *Stmt) Query(args ...interface{}) (*sql.Rows, error) {
//
// Example usage:
//
-// var name string
-// err := nameByUseridStmt.QueryRow(id).Scan(&name)
+// var name string
+// err := nameByUseridStmt.QueryRow(id).Scan(&name)
func (s *Stmt) QueryRow(args ...interface{}) *sql.Row {
return s.QueryRowContext(context.Background(), args...)
}
diff --git a/database/gdb/gdb_type_result.go b/database/gdb/gdb_type_result.go
index 062381a48..d0a888e7f 100644
--- a/database/gdb/gdb_type_result.go
+++ b/database/gdb/gdb_type_result.go
@@ -98,7 +98,7 @@ func (r Result) Array(field ...string) []Value {
// Note that the item value may be type of slice.
func (r Result) MapKeyValue(key string) map[string]Value {
var (
- s = ""
+ s string
m = make(map[string]Value)
tempMap = make(map[string][]interface{})
hasMultiValues bool
diff --git a/database/gdb/gdb_type_result_scanlist.go b/database/gdb/gdb_type_result_scanlist.go
index 0824f5894..84210c07d 100644
--- a/database/gdb/gdb_type_result_scanlist.go
+++ b/database/gdb/gdb_type_result_scanlist.go
@@ -22,25 +22,30 @@ import (
// Note that the parameter `structSlicePointer` should be type of *[]struct/*[]*struct.
//
// Usage example 1: Normal attribute struct relation:
-// type EntityUser struct {
-// Uid int
-// Name string
-// }
-// type EntityUserDetail struct {
-// Uid int
-// Address string
-// }
-// type EntityUserScores struct {
-// Id int
-// Uid int
-// Score int
-// Course string
-// }
-// type Entity struct {
-// User *EntityUser
-// UserDetail *EntityUserDetail
-// UserScores []*EntityUserScores
-// }
+//
+// type EntityUser struct {
+// Uid int
+// Name string
+// }
+//
+// type EntityUserDetail struct {
+// Uid int
+// Address string
+// }
+//
+// type EntityUserScores struct {
+// Id int
+// Uid int
+// Score int
+// Course string
+// }
+//
+// type Entity struct {
+// User *EntityUser
+// UserDetail *EntityUserDetail
+// UserScores []*EntityUserScores
+// }
+//
// var users []*Entity
// ScanList(&users, "User")
// ScanList(&users, "User", "uid")
@@ -48,33 +53,35 @@ import (
// ScanList(&users, "UserScores", "User", "uid:Uid")
// ScanList(&users, "UserScores", "User", "uid")
//
-//
// Usage example 2: Embedded attribute struct relation:
-// type EntityUser struct {
-// Uid int
-// Name string
-// }
-// type EntityUserDetail struct {
-// Uid int
-// Address string
-// }
-// type EntityUserScores struct {
-// Id int
-// Uid int
-// Score int
-// }
-// type Entity struct {
-// EntityUser
-// UserDetail EntityUserDetail
-// UserScores []EntityUserScores
-// }
+//
+// type EntityUser struct {
+// Uid int
+// Name string
+// }
+//
+// type EntityUserDetail struct {
+// Uid int
+// Address string
+// }
+//
+// type EntityUserScores struct {
+// Id int
+// Uid int
+// Score int
+// }
+//
+// type Entity struct {
+// EntityUser
+// UserDetail EntityUserDetail
+// UserScores []EntityUserScores
+// }
//
// var users []*Entity
// ScanList(&users)
// ScanList(&users, "UserDetail", "uid")
// ScanList(&users, "UserScores", "uid")
//
-//
// The parameters "User/UserDetail/UserScores" in the example codes specify the target attribute struct
// that current result will be bound to.
//
diff --git a/database/gredis/gredis_adapter_goredis_conn.go b/database/gredis/gredis_adapter_goredis_conn.go
index fe0df51b2..57b644ae4 100644
--- a/database/gredis/gredis_adapter_goredis_conn.go
+++ b/database/gredis/gredis_adapter_goredis_conn.go
@@ -10,9 +10,9 @@ import (
"context"
"github.com/go-redis/redis/v8"
- "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/container/gvar"
+ "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/gconv"
)
diff --git a/database/gredis/gredis_config.go b/database/gredis/gredis_config.go
index 3b7814237..6a8f7d231 100644
--- a/database/gredis/gredis_config.go
+++ b/database/gredis/gredis_config.go
@@ -20,7 +20,8 @@ import (
// Config is redis configuration.
type Config struct {
- Address string `json:"address"` // It supports single and cluster redis server. Multiple addresses joined with char ','. Eg: 192.168.1.1:6379, 192.168.1.2:6379.
+ // Address It supports single and cluster redis server. Multiple addresses joined with char ','. Eg: 192.168.1.1:6379, 192.168.1.2:6379.
+ Address string `json:"address"`
Db int `json:"db"` // Redis db.
Pass string `json:"pass"` // Password for AUTH.
MinIdle int `json:"minIdle"` // Minimum number of connections allowed to be idle (default is 0)
diff --git a/database/gredis/gredis_redis_conn.go b/database/gredis/gredis_redis_conn.go
index 720e738a3..a2a4c6969 100644
--- a/database/gredis/gredis_redis_conn.go
+++ b/database/gredis/gredis_redis_conn.go
@@ -10,13 +10,14 @@ import (
"context"
"reflect"
+ "go.opentelemetry.io/otel"
+ "go.opentelemetry.io/otel/trace"
+
"github.com/gogf/gf/v2"
"github.com/gogf/gf/v2/container/gvar"
"github.com/gogf/gf/v2/internal/json"
"github.com/gogf/gf/v2/internal/reflection"
"github.com/gogf/gf/v2/os/gtime"
- "go.opentelemetry.io/otel"
- "go.opentelemetry.io/otel/trace"
)
// RedisConn is a connection of redis client.
diff --git a/database/gredis/gredis_redis_trace.go b/database/gredis/gredis_redis_trace.go
index 68af5bb12..b54eede8c 100644
--- a/database/gredis/gredis_redis_trace.go
+++ b/database/gredis/gredis_redis_trace.go
@@ -41,9 +41,7 @@ func (c *RedisConn) traceSpanEnd(ctx context.Context, span trace.Span, item *tra
if gtrace.IsUsingDefaultProvider() || !gtrace.IsTracingInternal() {
return
}
- if ctx == nil {
- ctx = context.Background()
- }
+
if item.err != nil {
span.SetStatus(codes.Error, fmt.Sprintf(`%+v`, item.err))
}
diff --git a/debug/gdebug/gdebug_caller.go b/debug/gdebug/gdebug_caller.go
index c214c12a8..d02ff4ab8 100644
--- a/debug/gdebug/gdebug_caller.go
+++ b/debug/gdebug/gdebug_caller.go
@@ -30,7 +30,7 @@ var (
func init() {
if goRootForFilter != "" {
- goRootForFilter = strings.Replace(goRootForFilter, "\\", "/", -1)
+ goRootForFilter = strings.ReplaceAll(goRootForFilter, "\\", "/")
}
// Initialize internal package variable: selfPath.
selfPath, _ = exec.LookPath(os.Args[0])
diff --git a/debug/gdebug/gdebug_stack.go b/debug/gdebug/gdebug_stack.go
index 0bfc6030c..20db7d802 100644
--- a/debug/gdebug/gdebug_stack.go
+++ b/debug/gdebug/gdebug_stack.go
@@ -44,7 +44,7 @@ func StackWithFilters(filters []string, skip ...int) string {
number = skip[0]
}
var (
- name = ""
+ name string
space = " "
index = 1
buffer = bytes.NewBuffer(nil)
diff --git a/encoding/gbinary/gbinary_be.go b/encoding/gbinary/gbinary_be.go
index 1045d2426..6f6085489 100644
--- a/encoding/gbinary/gbinary_be.go
+++ b/encoding/gbinary/gbinary_be.go
@@ -104,7 +104,7 @@ func BeDecodeToString(b []byte) string {
}
func BeEncodeBool(b bool) []byte {
- if b == true {
+ if b {
return []byte{1}
} else {
return []byte{0}
@@ -221,7 +221,7 @@ func BeDecodeToBool(b []byte) bool {
if len(b) == 0 {
return false
}
- if bytes.Compare(b, make([]byte, len(b))) == 0 {
+ if bytes.Equal(b, make([]byte, len(b))) {
return false
}
return true
diff --git a/encoding/gbinary/gbinary_le.go b/encoding/gbinary/gbinary_le.go
index 76186c46f..b648c09d2 100644
--- a/encoding/gbinary/gbinary_le.go
+++ b/encoding/gbinary/gbinary_le.go
@@ -104,7 +104,7 @@ func LeDecodeToString(b []byte) string {
}
func LeEncodeBool(b bool) []byte {
- if b == true {
+ if b {
return []byte{1}
} else {
return []byte{0}
@@ -221,7 +221,7 @@ func LeDecodeToBool(b []byte) bool {
if len(b) == 0 {
return false
}
- if bytes.Compare(b, make([]byte, len(b))) == 0 {
+ if bytes.Equal(b, make([]byte, len(b))) {
return false
}
return true
diff --git a/encoding/gcompress/gcompress_zip.go b/encoding/gcompress/gcompress_zip.go
index 1d2290c08..05bf5c702 100644
--- a/encoding/gcompress/gcompress_zip.go
+++ b/encoding/gcompress/gcompress_zip.go
@@ -112,7 +112,7 @@ func doZipPathWriter(fileOrFolderPath string, exclude string, zipWriter *zip.Wri
headerPrefix = gfile.Basename(fileOrFolderPath)
}
}
- headerPrefix = strings.Replace(headerPrefix, "//", "/", -1)
+ headerPrefix = strings.ReplaceAll(headerPrefix, "//", "/")
for _, file := range files {
if exclude == file {
intlog.Printf(context.TODO(), `exclude file path: %s`, file)
@@ -229,7 +229,7 @@ func zipFile(filePath string, prefix string, zw *zip.Writer) error {
file, err := os.Open(filePath)
if err != nil {
err = gerror.Wrapf(err, `os.Open failed for name "%s"`, filePath)
- return nil
+ return err
}
defer file.Close()
@@ -272,7 +272,7 @@ func createFileHeader(info os.FileInfo, prefix string) (*zip.FileHeader, error)
}
if len(prefix) > 0 {
- prefix = strings.Replace(prefix, `\`, `/`, -1)
+ prefix = strings.ReplaceAll(prefix, `\`, `/`)
prefix = strings.TrimRight(prefix, `/`)
header.Name = prefix + `/` + header.Name
}
diff --git a/encoding/ghash/ghash_ap.go b/encoding/ghash/ghash_ap.go
index 099fd2b3a..9ce369e84 100644
--- a/encoding/ghash/ghash_ap.go
+++ b/encoding/ghash/ghash_ap.go
@@ -8,7 +8,7 @@ package ghash
// AP implements the classic AP hash algorithm for 32 bits.
func AP(str []byte) uint32 {
- var hash uint32 = 0
+ var hash uint32
for i := 0; i < len(str); i++ {
if (i & 1) == 0 {
hash ^= (hash << 7) ^ uint32(str[i]) ^ (hash >> 3)
@@ -21,7 +21,7 @@ func AP(str []byte) uint32 {
// AP64 implements the classic AP hash algorithm for 64 bits.
func AP64(str []byte) uint64 {
- var hash uint64 = 0
+ var hash uint64
for i := 0; i < len(str); i++ {
if (i & 1) == 0 {
hash ^= (hash << 7) ^ uint64(str[i]) ^ (hash >> 3)
diff --git a/encoding/ghash/ghash_elf.go b/encoding/ghash/ghash_elf.go
index d46713a91..3562fc45b 100644
--- a/encoding/ghash/ghash_elf.go
+++ b/encoding/ghash/ghash_elf.go
@@ -8,8 +8,10 @@ package ghash
// ELF implements the classic ELF hash algorithm for 32 bits.
func ELF(str []byte) uint32 {
- var hash uint32 = 0
- var x uint32 = 0
+ var (
+ hash uint32
+ x uint32
+ )
for i := 0; i < len(str); i++ {
hash = (hash << 4) + uint32(str[i])
if x = hash & 0xF0000000; x != 0 {
@@ -23,8 +25,8 @@ func ELF(str []byte) uint32 {
// ELF64 implements the classic ELF hash algorithm for 64 bits.
func ELF64(str []byte) uint64 {
var (
- hash uint64 = 0
- x uint64 = 0
+ hash uint64
+ x uint64
)
for i := 0; i < len(str); i++ {
hash = (hash << 4) + uint64(str[i])
diff --git a/encoding/ghash/ghash_pjw.go b/encoding/ghash/ghash_pjw.go
index 39d2813e4..5b82ca1ed 100644
--- a/encoding/ghash/ghash_pjw.go
+++ b/encoding/ghash/ghash_pjw.go
@@ -9,12 +9,12 @@ package ghash
// PJW implements the classic PJW hash algorithm for 32 bits.
func PJW(str []byte) uint32 {
var (
- BitsInUnsignedInt uint32 = 4 * 8
- ThreeQuarters uint32 = (BitsInUnsignedInt * 3) / 4
- OneEighth uint32 = BitsInUnsignedInt / 8
+ BitsInUnsignedInt uint32 = 32 // 4 * 8
+ ThreeQuarters = (BitsInUnsignedInt * 3) / 4
+ OneEighth = BitsInUnsignedInt / 8
HighBits uint32 = (0xFFFFFFFF) << (BitsInUnsignedInt - OneEighth)
- hash uint32 = 0
- test uint32 = 0
+ hash uint32
+ test uint32
)
for i := 0; i < len(str); i++ {
hash = (hash << OneEighth) + uint32(str[i])
@@ -28,12 +28,12 @@ func PJW(str []byte) uint32 {
// PJW64 implements the classic PJW hash algorithm for 64 bits.
func PJW64(str []byte) uint64 {
var (
- BitsInUnsignedInt uint64 = 4 * 8
- ThreeQuarters uint64 = (BitsInUnsignedInt * 3) / 4
- OneEighth uint64 = BitsInUnsignedInt / 8
+ BitsInUnsignedInt uint64 = 32 // 4 * 8
+ ThreeQuarters = (BitsInUnsignedInt * 3) / 4
+ OneEighth = BitsInUnsignedInt / 8
HighBits uint64 = (0xFFFFFFFFFFFFFFFF) << (BitsInUnsignedInt - OneEighth)
- hash uint64 = 0
- test uint64 = 0
+ hash uint64
+ test uint64
)
for i := 0; i < len(str); i++ {
hash = (hash << OneEighth) + uint64(str[i])
diff --git a/encoding/ghash/ghash_sdbm.go b/encoding/ghash/ghash_sdbm.go
index 0f2fa6bf9..bbda94375 100644
--- a/encoding/ghash/ghash_sdbm.go
+++ b/encoding/ghash/ghash_sdbm.go
@@ -8,7 +8,7 @@ package ghash
// SDBM implements the classic SDBM hash algorithm for 32 bits.
func SDBM(str []byte) uint32 {
- var hash uint32 = 0
+ var hash uint32
for i := 0; i < len(str); i++ {
// equivalent to: hash = 65599*hash + uint32(str[i]);
hash = uint32(str[i]) + (hash << 6) + (hash << 16) - hash
@@ -18,7 +18,7 @@ func SDBM(str []byte) uint32 {
// SDBM64 implements the classic SDBM hash algorithm for 64 bits.
func SDBM64(str []byte) uint64 {
- var hash uint64 = 0
+ var hash uint64
for i := 0; i < len(str); i++ {
// equivalent to: hash = 65599*hash + uint32(str[i])
hash = uint64(str[i]) + (hash << 6) + (hash << 16) - hash
diff --git a/encoding/gini/gini.go b/encoding/gini/gini.go
index dbc4e9838..a9f0e821d 100644
--- a/encoding/gini/gini.go
+++ b/encoding/gini/gini.go
@@ -61,7 +61,7 @@ func Decode(data []byte) (res map[string]interface{}, err error) {
fieldMap = make(map[string]interface{})
}
haveSection = true
- } else if haveSection == false {
+ } else if !haveSection {
continue
}
@@ -72,7 +72,7 @@ func Decode(data []byte) (res map[string]interface{}, err error) {
}
}
- if haveSection == false {
+ if !haveSection {
return nil, gerror.NewCode(gcode.CodeInvalidParameter, "failed to parse INI file, section not found")
}
return res, nil
diff --git a/encoding/gjson/gjson_z_example_conversion_test.go b/encoding/gjson/gjson_z_example_conversion_test.go
index 6d737a9be..8d1023040 100644
--- a/encoding/gjson/gjson_z_example_conversion_test.go
+++ b/encoding/gjson/gjson_z_example_conversion_test.go
@@ -8,6 +8,7 @@ package gjson_test
import (
"fmt"
+
"github.com/gogf/gf/v2/encoding/gjson"
)
diff --git a/encoding/gjson/gjson_z_example_test.go b/encoding/gjson/gjson_z_example_test.go
index 2bda1b8c1..793ee1a9c 100644
--- a/encoding/gjson/gjson_z_example_test.go
+++ b/encoding/gjson/gjson_z_example_test.go
@@ -2,6 +2,7 @@ package gjson_test
import (
"fmt"
+
"github.com/gogf/gf/v2/encoding/gjson"
)
@@ -104,10 +105,10 @@ func ExampleJson_ToJsonIndent() {
fmt.Println(string(jsonBytes))
// Output:
- //{
+ // {
// "Age": 18,
// "Name": "John"
- //}
+ // }
}
func ExampleJson_ToJsonIndentString() {
@@ -126,10 +127,10 @@ func ExampleJson_ToJsonIndentString() {
fmt.Println(jsonStr)
// Output:
- //{
+ // {
// "Age": 18,
// "Name": "John"
- //}
+ // }
}
func ExampleJson_MustToJson() {
@@ -186,10 +187,10 @@ func ExampleJson_MustToJsonIndent() {
fmt.Println(string(jsonBytes))
// Output:
- //{
+ // {
// "Age": 18,
// "Name": "John"
- //}
+ // }
}
func ExampleJson_MustToJsonIndentString() {
@@ -208,10 +209,10 @@ func ExampleJson_MustToJsonIndentString() {
fmt.Println(jsonStr)
// Output:
- //{
+ // {
// "Age": 18,
// "Name": "John"
- //}
+ // }
}
// ========================================================================
@@ -271,10 +272,10 @@ func ExampleJson_ToXmlIndent() {
fmt.Println(string(xmlBytes))
// Output:
- //
+ //
// 18
// John
- //
+ //
}
func ExampleJson_ToXmlIndentString() {
@@ -293,10 +294,10 @@ func ExampleJson_ToXmlIndentString() {
fmt.Println(string(xmlStr))
// Output:
- //
+ //
// 18
// John
- //
+ //
}
func ExampleJson_MustToXml() {
@@ -353,10 +354,10 @@ func ExampleJson_MustToXmlIndent() {
fmt.Println(string(xmlBytes))
// Output:
- //
+ //
// 18
// John
- //
+ //
}
func ExampleJson_MustToXmlIndentString() {
@@ -375,10 +376,10 @@ func ExampleJson_MustToXmlIndentString() {
fmt.Println(string(xmlStr))
// Output:
- //
+ //
// 18
// John
- //
+ //
}
// ========================================================================
@@ -400,8 +401,8 @@ func ExampleJson_ToYaml() {
fmt.Println(string(YamlBytes))
// Output:
- //Age: 18
- //Name: John
+ // Age: 18
+ // Name: John
}
func ExampleJson_ToYamlString() {
@@ -420,8 +421,8 @@ func ExampleJson_ToYamlString() {
fmt.Println(string(YamlStr))
// Output:
- //Age: 18
- //Name: John
+ // Age: 18
+ // Name: John
}
func ExampleJson_ToYamlIndent() {
@@ -440,8 +441,8 @@ func ExampleJson_ToYamlIndent() {
fmt.Println(string(YamlBytes))
// Output:
- //Age: 18
- //Name: John
+ // Age: 18
+ // Name: John
}
func ExampleJson_MustToYaml() {
@@ -460,8 +461,8 @@ func ExampleJson_MustToYaml() {
fmt.Println(string(YamlBytes))
// Output:
- //Age: 18
- //Name: John
+ // Age: 18
+ // Name: John
}
func ExampleJson_MustToYamlString() {
@@ -480,8 +481,8 @@ func ExampleJson_MustToYamlString() {
fmt.Println(string(YamlStr))
// Output:
- //Age: 18
- //Name: John
+ // Age: 18
+ // Name: John
}
// ========================================================================
@@ -503,8 +504,8 @@ func ExampleJson_ToToml() {
fmt.Println(string(TomlBytes))
// Output:
- //Age = 18
- //Name = "John"
+ // Age = 18
+ // Name = "John"
}
func ExampleJson_ToTomlString() {
@@ -523,8 +524,8 @@ func ExampleJson_ToTomlString() {
fmt.Println(string(TomlStr))
// Output:
- //Age = 18
- //Name = "John"
+ // Age = 18
+ // Name = "John"
}
func ExampleJson_MustToToml() {
@@ -543,8 +544,8 @@ func ExampleJson_MustToToml() {
fmt.Println(string(TomlBytes))
// Output:
- //Age = 18
- //Name = "John"
+ // Age = 18
+ // Name = "John"
}
func ExampleJson_MustToTomlString() {
@@ -563,8 +564,8 @@ func ExampleJson_MustToTomlString() {
fmt.Println(string(TomlStr))
// Output:
- //Age = 18
- //Name = "John"
+ // Age = 18
+ // Name = "John"
}
// ========================================================================
@@ -586,8 +587,8 @@ func ExampleJson_ToIni() {
fmt.Println(string(IniBytes))
// May Output:
- //Name=John
- //Age=18
+ // Name=John
+ // Age=18
}
func ExampleJson_ToIniString() {
@@ -604,7 +605,7 @@ func ExampleJson_ToIniString() {
fmt.Println(string(IniStr))
// Output:
- //Name=John
+ // Name=John
}
func ExampleJson_MustToIni() {
@@ -621,7 +622,7 @@ func ExampleJson_MustToIni() {
fmt.Println(string(IniBytes))
// Output:
- //Name=John
+ // Name=John
}
func ExampleJson_MustToIniString() {
@@ -638,7 +639,7 @@ func ExampleJson_MustToIniString() {
fmt.Println(string(IniStr))
// Output:
- //Name=John
+ // Name=John
}
// ========================================================================
@@ -1180,8 +1181,8 @@ func ExampleJson_Dump() {
j.Dump()
// May Output:
- //{
+ // {
// "name": "john",
// "age": "18",
- //}
+ // }
}
diff --git a/encoding/gproperties/gproperties.go b/encoding/gproperties/gproperties.go
index b26129322..580fe2980 100644
--- a/encoding/gproperties/gproperties.go
+++ b/encoding/gproperties/gproperties.go
@@ -12,10 +12,11 @@ import (
"sort"
"strings"
+ "github.com/magiconair/properties"
+
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/internal/json"
"github.com/gogf/gf/v2/util/gconv"
- "github.com/magiconair/properties"
)
// Decode converts properties format to map.
diff --git a/encoding/gproperties/gproperties_z_unit_test.go b/encoding/gproperties/gproperties_z_unit_test.go
index f3ff79310..c23ad2709 100644
--- a/encoding/gproperties/gproperties_z_unit_test.go
+++ b/encoding/gproperties/gproperties_z_unit_test.go
@@ -28,6 +28,7 @@ sql.mysql.0.type = mysql
sql.mysql.0.ip = 127.0.0.1
sql.mysql.0.user = root
`
+
var errorTests = []struct {
input, msg string
}{
@@ -75,6 +76,7 @@ func TestDecode(t *testing.T) {
}
})
}
+
func TestEncode(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
m := make(map[string]interface{})
diff --git a/encoding/gtoml/gtoml.go b/encoding/gtoml/gtoml.go
index 79137d6b8..aeca726bb 100644
--- a/encoding/gtoml/gtoml.go
+++ b/encoding/gtoml/gtoml.go
@@ -11,8 +11,8 @@ import (
"bytes"
"github.com/BurntSushi/toml"
- "github.com/gogf/gf/v2/errors/gerror"
+ "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/internal/json"
)
diff --git a/encoding/gurl/url.go b/encoding/gurl/url.go
index e64d0a28b..21b9b74ee 100644
--- a/encoding/gurl/url.go
+++ b/encoding/gurl/url.go
@@ -33,14 +33,14 @@ func Decode(str string) (string, error) {
// URL-encode according to RFC 3986.
// See http://php.net/manual/en/function.rawurlencode.php.
func RawEncode(str string) string {
- return strings.Replace(url.QueryEscape(str), "+", "%20", -1)
+ return strings.ReplaceAll(url.QueryEscape(str), "+", "%20")
}
// RawDecode does decode the given string
// Decode URL-encoded strings.
// See http://php.net/manual/en/function.rawurldecode.php.
func RawDecode(str string) (string, error) {
- return url.QueryUnescape(strings.Replace(str, "%20", "+", -1))
+ return url.QueryUnescape(strings.ReplaceAll(str, "%20", "+"))
}
// BuildQuery Generate URL-encoded query string.
diff --git a/encoding/gxml/gxml.go b/encoding/gxml/gxml.go
index efd3c7b1d..2b462de2d 100644
--- a/encoding/gxml/gxml.go
+++ b/encoding/gxml/gxml.go
@@ -11,9 +11,9 @@ import (
"strings"
"github.com/clbanning/mxj/v2"
- "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/encoding/gcharset"
+ "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/text/gregex"
)
@@ -77,9 +77,9 @@ func ToJson(content []byte) ([]byte, error) {
}
mv, err := mxj.NewMapXml(res)
if err == nil {
- err = gerror.Wrapf(err, `mxj.NewMapXml failed`)
return mv.Json()
}
+ err = gerror.Wrap(err, `mxj.NewMapXml failed`)
return nil, err
}
diff --git a/errors/gerror/gerror.go b/errors/gerror/gerror.go
index 68c9bc653..6bb4614cc 100644
--- a/errors/gerror/gerror.go
+++ b/errors/gerror/gerror.go
@@ -61,6 +61,9 @@ type IUnwrap interface {
const (
// commandEnvKeyForBrief is the command environment name for switch key for brief error stack.
commandEnvKeyForBrief = "gf.gerror.brief"
+
+ // commaSeparatorSpace is the comma separator with space.
+ commaSeparatorSpace = ", "
)
var (
diff --git a/errors/gerror/gerror_api_code.go b/errors/gerror/gerror_api_code.go
index f4389eec8..e4e4a2b63 100644
--- a/errors/gerror/gerror_api_code.go
+++ b/errors/gerror/gerror_api_code.go
@@ -17,7 +17,7 @@ import (
func NewCode(code gcode.Code, text ...string) error {
return &Error{
stack: callers(),
- text: strings.Join(text, ", "),
+ text: strings.Join(text, commaSeparatorSpace),
code: code,
}
}
@@ -36,7 +36,7 @@ func NewCodef(code gcode.Code, format string, args ...interface{}) error {
func NewCodeSkip(code gcode.Code, skip int, text ...string) error {
return &Error{
stack: callers(skip),
- text: strings.Join(text, ", "),
+ text: strings.Join(text, commaSeparatorSpace),
code: code,
}
}
@@ -60,7 +60,7 @@ func WrapCode(code gcode.Code, err error, text ...string) error {
return &Error{
error: err,
stack: callers(),
- text: strings.Join(text, ", "),
+ text: strings.Join(text, commaSeparatorSpace),
code: code,
}
}
@@ -89,7 +89,7 @@ func WrapCodeSkip(code gcode.Code, skip int, err error, text ...string) error {
return &Error{
error: err,
stack: callers(skip),
- text: strings.Join(text, ", "),
+ text: strings.Join(text, commaSeparatorSpace),
code: code,
}
}
diff --git a/errors/gerror/gerror_error.go b/errors/gerror/gerror_error.go
index 8a41bf79f..b05bfd1f5 100644
--- a/errors/gerror/gerror_error.go
+++ b/errors/gerror/gerror_error.go
@@ -35,7 +35,7 @@ var (
func init() {
if goRootForFilter != "" {
- goRootForFilter = strings.Replace(goRootForFilter, "\\", "/", -1)
+ goRootForFilter = strings.ReplaceAll(goRootForFilter, "\\", "/")
}
}
diff --git a/errors/gerror/gerror_error_format.go b/errors/gerror/gerror_error_format.go
index cb8a5fcb4..16be393e6 100644
--- a/errors/gerror/gerror_error_format.go
+++ b/errors/gerror/gerror_error_format.go
@@ -16,7 +16,7 @@ import (
// %v, %s : Print all the error string;
// %-v, %-s : Print current level error string;
// %+s : Print full stack error list;
-// %+v : Print the error string and full stack error list;
+// %+v : Print the error string and full stack error list
func (err *Error) Format(s fmt.State, verb rune) {
switch verb {
case 's', 'v':
diff --git a/example/config/kubecm/boot_out_pod/boot.go b/example/config/kubecm/boot_out_pod/boot.go
index a51230f09..936f68b2d 100644
--- a/example/config/kubecm/boot_out_pod/boot.go
+++ b/example/config/kubecm/boot_out_pod/boot.go
@@ -1,11 +1,10 @@
package boot
import (
- "k8s.io/client-go/kubernetes"
-
"github.com/gogf/gf/contrib/config/kubecm/v2"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gctx"
+ "k8s.io/client-go/kubernetes"
)
const (
diff --git a/example/config/nacos/main.go b/example/config/nacos/main.go
index 47e003adc..f7b38bf42 100644
--- a/example/config/nacos/main.go
+++ b/example/config/nacos/main.go
@@ -2,6 +2,7 @@ package nacos
import (
_ "github.com/gogf/gf/example/config/nacos/boot"
+
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gctx"
)
diff --git a/example/config/polaris/main.go b/example/config/polaris/main.go
index 82ddb9515..a23632206 100644
--- a/example/config/polaris/main.go
+++ b/example/config/polaris/main.go
@@ -2,6 +2,7 @@ package polaris
import (
_ "github.com/gogf/gf/example/config/polaris/boot"
+
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gctx"
)
diff --git a/example/httpserver/response_with_json_array/controller.go b/example/httpserver/response_with_json_array/controller.go
index 8f53c204a..2f34a0bab 100644
--- a/example/httpserver/response_with_json_array/controller.go
+++ b/example/httpserver/response_with_json_array/controller.go
@@ -9,6 +9,7 @@ import (
type Req struct {
g.Meta `path:"/user" method:"get"`
}
+
type Res []Item
type Item struct {
diff --git a/example/httpserver/swagger/main.go b/example/httpserver/swagger/main.go
index b614b0702..2105fcba7 100644
--- a/example/httpserver/swagger/main.go
+++ b/example/httpserver/swagger/main.go
@@ -12,6 +12,7 @@ type HelloReq struct {
g.Meta `path:"/hello" method:"get" sort:"1"`
Name string `v:"required" dc:"Your name"`
}
+
type HelloRes struct {
Reply string `dc:"Reply content"`
}
diff --git a/example/registry/polaris/client/main.go b/example/registry/polaris/client/main.go
index 7be0f412e..03ca7a6b7 100644
--- a/example/registry/polaris/client/main.go
+++ b/example/registry/polaris/client/main.go
@@ -5,13 +5,12 @@ import (
"fmt"
"time"
- "github.com/polarismesh/polaris-go/api"
- "github.com/polarismesh/polaris-go/pkg/config"
-
"github.com/gogf/gf/contrib/registry/polaris/v2"
"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/api"
+ "github.com/polarismesh/polaris-go/pkg/config"
)
func main() {
diff --git a/example/registry/polaris/server/main.go b/example/registry/polaris/server/main.go
index 7e92c697e..b0a2c0486 100644
--- a/example/registry/polaris/server/main.go
+++ b/example/registry/polaris/server/main.go
@@ -3,13 +3,12 @@ package main
import (
"context"
- "github.com/polarismesh/polaris-go/api"
- "github.com/polarismesh/polaris-go/pkg/config"
-
"github.com/gogf/gf/contrib/registry/polaris/v2"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/net/gsvc"
+ "github.com/polarismesh/polaris-go/api"
+ "github.com/polarismesh/polaris-go/pkg/config"
)
func main() {
diff --git a/example/trace/grpc_with_db/client/main.go b/example/trace/grpc_with_db/client/main.go
index 5a68dacf5..50eac7edb 100644
--- a/example/trace/grpc_with_db/client/main.go
+++ b/example/trace/grpc_with_db/client/main.go
@@ -2,10 +2,11 @@ package main
import (
"github.com/gogf/gf/contrib/trace/jaeger/v2"
- "github.com/gogf/gf/example/trace/grpc_with_db/protobuf/user"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/gtrace"
"github.com/gogf/gf/v2/os/gctx"
+
+ "github.com/gogf/gf/example/trace/grpc_with_db/protobuf/user"
)
const (
diff --git a/example/trace/grpc_with_db/protobuf/user/client.go b/example/trace/grpc_with_db/protobuf/user/client.go
index 50accd9db..1644dffc3 100644
--- a/example/trace/grpc_with_db/protobuf/user/client.go
+++ b/example/trace/grpc_with_db/protobuf/user/client.go
@@ -1,9 +1,8 @@
package user
import (
- "google.golang.org/grpc"
-
"github.com/gogf/katyusha/krpc"
+ "google.golang.org/grpc"
)
const (
diff --git a/example/trace/grpc_with_db/server/main.go b/example/trace/grpc_with_db/server/main.go
index fccfc2230..5738c796e 100644
--- a/example/trace/grpc_with_db/server/main.go
+++ b/example/trace/grpc_with_db/server/main.go
@@ -1,19 +1,20 @@
package main
import (
+ _ "github.com/gogf/gf/contrib/drivers/mysql/v2"
+
"context"
"fmt"
"time"
- _ "github.com/gogf/gf/contrib/drivers/mysql/v2"
-
"github.com/gogf/gf/contrib/trace/jaeger/v2"
- "github.com/gogf/gf/example/trace/grpc_with_db/protobuf/user"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gcache"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/katyusha/krpc"
+
+ "github.com/gogf/gf/example/trace/grpc_with_db/protobuf/user"
)
type server struct{}
diff --git a/example/trace/http_with_db/server/main.go b/example/trace/http_with_db/server/main.go
index 2a1e946db..98951396b 100644
--- a/example/trace/http_with_db/server/main.go
+++ b/example/trace/http_with_db/server/main.go
@@ -1,12 +1,12 @@
package main
import (
+ _ "github.com/gogf/gf/contrib/drivers/mysql/v2"
+
"context"
"fmt"
"time"
- _ "github.com/gogf/gf/contrib/drivers/mysql/v2"
-
"github.com/gogf/gf/contrib/trace/jaeger/v2"
"github.com/gogf/gf/v2/database/gdb"
"github.com/gogf/gf/v2/frame/g"
@@ -46,6 +46,7 @@ func main() {
type InsertReq struct {
Name string `v:"required#Please input user name."`
}
+
type InsertRes struct {
Id int64
}
@@ -66,6 +67,7 @@ func (c *cTrace) Insert(ctx context.Context, req *InsertReq) (res *InsertRes, er
type QueryReq struct {
Id int `v:"min:1#User id is required for querying"`
}
+
type QueryRes struct {
User gdb.Record
}
@@ -90,6 +92,7 @@ func (c *cTrace) Query(ctx context.Context, req *QueryReq) (res *QueryRes, err e
type DeleteReq struct {
Id int `v:"min:1#User id is required for deleting."`
}
+
type DeleteRes struct{}
// Delete is a route handler for deleting specified user info.
diff --git a/frame/gins/gins_z_unit_config_test.go b/frame/gins/gins_z_unit_config_test.go
index d635ba0c5..7a335f114 100644
--- a/frame/gins/gins_z_unit_config_test.go
+++ b/frame/gins/gins_z_unit_config_test.go
@@ -195,6 +195,7 @@ func Test_Config4(t *testing.T) {
t.Assert(gins.Config("test").MustGet(ctx, "redis.disk"), `{"address":"127.0.0.1:6379","db":1}`)
})
}
+
func Test_Basic2(t *testing.T) {
config := `log-path = "logs"`
gtest.C(t, func(t *gtest.T) {
diff --git a/i18n/gi18n/gi18n_z_unit_test.go b/i18n/gi18n/gi18n_z_unit_test.go
index 0a84469ae..c05085895 100644
--- a/i18n/gi18n/gi18n_z_unit_test.go
+++ b/i18n/gi18n/gi18n_z_unit_test.go
@@ -7,11 +7,11 @@
package gi18n_test
import (
+ _ "github.com/gogf/gf/v2/os/gres/testdata/data"
+
"context"
"testing"
- _ "github.com/gogf/gf/v2/os/gres/testdata/data"
-
"github.com/gogf/gf/v2/debug/gdebug"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/i18n/gi18n"
diff --git a/internal/command/command.go b/internal/command/command.go
index e704e6a9f..688201eb1 100644
--- a/internal/command/command.go
+++ b/internal/command/command.go
@@ -118,11 +118,11 @@ func GetArgAll() []string {
// 1. Command line arguments are in lowercase format, eg: gf.package.variable;
// 2. Environment arguments are in uppercase format, eg: GF_PACKAGE_VARIABLE；
func GetOptWithEnv(key string, def ...string) string {
- cmdKey := strings.ToLower(strings.Replace(key, "_", ".", -1))
+ cmdKey := strings.ToLower(strings.ReplaceAll(key, "_", "."))
if ContainsOpt(cmdKey) {
return GetOpt(cmdKey)
} else {
- envKey := strings.ToUpper(strings.Replace(key, ".", "_", -1))
+ envKey := strings.ToUpper(strings.ReplaceAll(key, ".", "_"))
if r, ok := os.LookupEnv(envKey); ok {
return r
} else {
diff --git a/internal/empty/empty.go b/internal/empty/empty.go
index 551457ce9..cf581074b 100644
--- a/internal/empty/empty.go
+++ b/internal/empty/empty.go
@@ -69,7 +69,7 @@ func IsEmpty(value interface{}) bool {
case float64:
return result == 0
case bool:
- return result == false
+ return !result
case string:
return result == ""
case []byte:
diff --git a/internal/empty/empty_z_unit_test.go b/internal/empty/empty_z_unit_test.go
index f063e86ef..36dc504ab 100644
--- a/internal/empty/empty_z_unit_test.go
+++ b/internal/empty/empty_z_unit_test.go
@@ -22,6 +22,7 @@ type TestString string
type TestPerson interface {
Say() string
}
+
type TestWoman struct {
}
diff --git a/internal/tracing/tracing.go b/internal/tracing/tracing.go
index 250cb39f3..c9d7a6f48 100644
--- a/internal/tracing/tracing.go
+++ b/internal/tracing/tracing.go
@@ -11,10 +11,11 @@ import (
"math"
"time"
+ "go.opentelemetry.io/otel/trace"
+
"github.com/gogf/gf/v2/container/gtype"
"github.com/gogf/gf/v2/encoding/gbinary"
"github.com/gogf/gf/v2/util/grand"
- "go.opentelemetry.io/otel/trace"
)
var (
diff --git a/internal/utils/utils_str.go b/internal/utils/utils_str.go
index 50da1a6f3..44c9f0db0 100644
--- a/internal/utils/utils_str.go
+++ b/internal/utils/utils_str.go
@@ -94,7 +94,7 @@ func UcFirst(s string) string {
// which is replaced by a map in unordered way, case-sensitively.
func ReplaceByMap(origin string, replaces map[string]string) string {
for k, v := range replaces {
- origin = strings.Replace(origin, k, v, -1)
+ origin = strings.ReplaceAll(origin, k, v)
}
return origin
}
@@ -144,12 +144,12 @@ func Trim(str string, characterMask ...string) string {
// FormatCmdKey formats string `s` as command key using uniformed format.
func FormatCmdKey(s string) string {
- return strings.ToLower(strings.Replace(s, "_", ".", -1))
+ return strings.ToLower(strings.ReplaceAll(s, "_", "."))
}
// FormatEnvKey formats string `s` as environment key using uniformed format.
func FormatEnvKey(s string) string {
- return strings.ToUpper(strings.Replace(s, ".", "_", -1))
+ return strings.ToUpper(strings.ReplaceAll(s, ".", "_"))
}
// StripSlashes un-quotes a quoted string by AddSlashes.
diff --git a/net/gclient/gclient_request.go b/net/gclient/gclient_request.go
index 2dbb26d10..c1df03ea7 100644
--- a/net/gclient/gclient_request.go
+++ b/net/gclient/gclient_request.go
@@ -98,7 +98,7 @@ func (c *Client) Trace(ctx context.Context, url string, data ...interface{}) (*R
//
// To make a request with a specified context.Context, use NewRequestWithContext
// and Client.Do.
-// Deprecated, use Post instead.
+// Deprecated: use Post instead.
func (c *Client) PostForm(url string, data url.Values) (resp *Response, err error) {
return nil, gerror.NewCode(
gcode.CodeNotSupported,
diff --git a/net/gclient/gclient_request_obj.go b/net/gclient/gclient_request_obj.go
index 0ca897e5a..d7dc2b097 100644
--- a/net/gclient/gclient_request_obj.go
+++ b/net/gclient/gclient_request_obj.go
@@ -23,16 +23,20 @@ import (
// DoRequestObj does HTTP request using standard request/response object.
// The request object `req` is defined like:
-// type UseCreateReq struct {
-// g.Meta `path:"/user" method:"put"`
-// // other fields....
-// }
+//
+// type UseCreateReq struct {
+// g.Meta `path:"/user" method:"put"`
+// // other fields....
+// }
+//
// The response object `res` should be a pointer type. It automatically converts result
// to given object `res` is success.
// Eg:
// var (
-// req = UseCreateReq{}
-// res *UseCreateRes
+//
+// req = UseCreateReq{}
+// res *UseCreateRes
+//
// )
// DoRequestObj(ctx, req, &res)
func (c *Client) DoRequestObj(ctx context.Context, req, res interface{}) error {
diff --git a/net/gclient/gclient_response.go b/net/gclient/gclient_response.go
index 27869aa85..e41cf5770 100644
--- a/net/gclient/gclient_response.go
+++ b/net/gclient/gclient_response.go
@@ -27,7 +27,7 @@ func (r *Response) initCookie() {
if r.cookies == nil {
r.cookies = make(map[string]string)
// Response might be nil.
- if r != nil && r.Response != nil {
+ if r.Response != nil {
for _, v := range r.Cookies() {
r.cookies[v.Name] = v.Value
}
diff --git a/net/gclient/gclient_tracing.go b/net/gclient/gclient_tracing.go
index da17c0866..f5a4e2d67 100644
--- a/net/gclient/gclient_tracing.go
+++ b/net/gclient/gclient_tracing.go
@@ -60,7 +60,7 @@ func internalMiddlewareTracing(c *Client, r *http.Request) (response *Response,
tracingInstrumentName,
trace.WithInstrumentationVersion(gf.VERSION),
)
- ctx, span := tr.Start(r.Context(), r.URL.String(), trace.WithSpanKind(trace.SpanKindClient))
+ ctx, span := tr.Start(ctx, r.URL.String(), trace.WithSpanKind(trace.SpanKindClient))
defer span.End()
span.SetAttributes(gtrace.CommonLabels()...)
diff --git a/net/gclient/gclient_z_example_test.go b/net/gclient/gclient_z_example_test.go
index f39f0fe64..5c274f869 100644
--- a/net/gclient/gclient_z_example_test.go
+++ b/net/gclient/gclient_z_example_test.go
@@ -15,13 +15,12 @@ import (
"time"
"github.com/gogf/gf/v2/debug/gdebug"
+ "github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/gclient"
+ "github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/os/gfile"
"github.com/gogf/gf/v2/util/guid"
-
- "github.com/gogf/gf/v2/frame/g"
- "github.com/gogf/gf/v2/net/ghttp"
)
var (
diff --git a/net/gclient/gclient_z_unit_feature_trace_test.go b/net/gclient/gclient_z_unit_feature_trace_test.go
index efa70b085..903c5acac 100644
--- a/net/gclient/gclient_z_unit_feature_trace_test.go
+++ b/net/gclient/gclient_z_unit_feature_trace_test.go
@@ -13,14 +13,15 @@ import (
"testing"
"time"
+ "go.opentelemetry.io/otel"
+ sdkTrace "go.opentelemetry.io/otel/sdk/trace"
+ "go.opentelemetry.io/otel/trace"
+
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/internal/tracing"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/guid"
- "go.opentelemetry.io/otel"
- sdkTrace "go.opentelemetry.io/otel/sdk/trace"
- "go.opentelemetry.io/otel/trace"
)
type CustomProvider struct {
diff --git a/net/gclient/gclient_z_unit_test.go b/net/gclient/gclient_z_unit_test.go
index b7fbae4b6..66ee46038 100644
--- a/net/gclient/gclient_z_unit_test.go
+++ b/net/gclient/gclient_z_unit_test.go
@@ -16,8 +16,9 @@ import (
"testing"
"time"
- "github.com/gogf/gf/v2/debug/gdebug"
+ "github.com/gorilla/websocket"
+ "github.com/gogf/gf/v2/debug/gdebug"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/gclient"
@@ -26,7 +27,6 @@ import (
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/guid"
- "github.com/gorilla/websocket"
)
var (
@@ -503,7 +503,7 @@ func Test_WebSocketClient(t *testing.T) {
s.SetDumpRouterMap(false)
s.Start()
// No closing in case of DATA RACE due to keep alive connection of WebSocket.
- //defer s.Shutdown()
+ // defer s.Shutdown()
time.Sleep(100 * time.Millisecond)
gtest.C(t, func(t *gtest.T) {
diff --git a/net/ghttp/ghttp.go b/net/ghttp/ghttp.go
index 5f27b7e5a..37c9136b0 100644
--- a/net/ghttp/ghttp.go
+++ b/net/ghttp/ghttp.go
@@ -12,12 +12,12 @@ import (
"reflect"
"time"
- "github.com/gogf/gf/v2/errors/gcode"
- "github.com/gogf/gf/v2/errors/gerror"
"github.com/gorilla/websocket"
"github.com/gogf/gf/v2/container/gmap"
"github.com/gogf/gf/v2/container/gtype"
+ "github.com/gogf/gf/v2/errors/gcode"
+ "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/net/goai"
"github.com/gogf/gf/v2/net/gsvc"
"github.com/gogf/gf/v2/os/gcache"
diff --git a/net/ghttp/ghttp_middleware_tracing.go b/net/ghttp/ghttp_middleware_tracing.go
index 1a2bf2095..84acf2c8c 100644
--- a/net/ghttp/ghttp_middleware_tracing.go
+++ b/net/ghttp/ghttp_middleware_tracing.go
@@ -107,5 +107,4 @@ func internalMiddlewareServerTracing(r *Request) {
attribute.String(tracingEventHttpResponseHeaders, gconv.String(httputil.HeaderToMap(r.Response.Header()))),
attribute.String(tracingEventHttpResponseBody, resBodyContent),
))
- return
}
diff --git a/net/ghttp/ghttp_request_param.go b/net/ghttp/ghttp_request_param.go
index 936dc4dc8..7f96883c0 100644
--- a/net/ghttp/ghttp_request_param.go
+++ b/net/ghttp/ghttp_request_param.go
@@ -12,6 +12,7 @@ import (
"io"
"io/ioutil"
"mime/multipart"
+ "net/http"
"reflect"
"strings"
@@ -318,7 +319,7 @@ func (r *Request) parseForm() {
}
// It parses the request body without checking the Content-Type.
if r.formMap == nil {
- if r.Method != "GET" {
+ if r.Method != http.MethodGet {
r.parseBody()
}
if len(r.bodyMap) > 0 {
@@ -349,7 +350,7 @@ func (r *Request) GetMultipartFiles(name string) []*multipart.FileHeader {
}
// Support "name[0]","name[1]","name[2]", etc. as array parameter.
var (
- key = ""
+ key string
files = make([]*multipart.FileHeader, 0)
)
for i := 0; ; i++ {
diff --git a/net/ghttp/ghttp_request_param_query.go b/net/ghttp/ghttp_request_param_query.go
index 82739fa99..5badddbfe 100644
--- a/net/ghttp/ghttp_request_param_query.go
+++ b/net/ghttp/ghttp_request_param_query.go
@@ -7,6 +7,8 @@
package ghttp
import (
+ "net/http"
+
"github.com/gogf/gf/v2/container/gvar"
"github.com/gogf/gf/v2/util/gconv"
)
@@ -33,7 +35,7 @@ func (r *Request) GetQuery(key string, def ...interface{}) *gvar.Var {
return gvar.New(value)
}
}
- if r.Method == "GET" {
+ if r.Method == http.MethodGet {
r.parseBody()
}
if len(r.bodyMap) > 0 {
@@ -55,7 +57,7 @@ func (r *Request) GetQuery(key string, def ...interface{}) *gvar.Var {
// in order of priority: query > body.
func (r *Request) GetQueryMap(kvMap ...map[string]interface{}) map[string]interface{} {
r.parseQuery()
- if r.Method == "GET" {
+ if r.Method == http.MethodGet {
r.parseBody()
}
var m map[string]interface{}
@@ -95,7 +97,9 @@ func (r *Request) GetQueryMap(kvMap ...map[string]interface{}) map[string]interf
}
// GetQueryMapStrStr retrieves and returns all parameters passed from the client using the HTTP GET method as a
-// map[string]string. The parameter `kvMap` specifies the keys
+//
+// map[string]string. The parameter `kvMap` specifies the keys
+//
// retrieving from client parameters, the associated values are the default values if the client
// does not pass.
func (r *Request) GetQueryMapStrStr(kvMap ...map[string]interface{}) map[string]string {
diff --git a/net/ghttp/ghttp_response_cors.go b/net/ghttp/ghttp_response_cors.go
index 438c79ac3..59772f552 100644
--- a/net/ghttp/ghttp_response_cors.go
+++ b/net/ghttp/ghttp_response_cors.go
@@ -11,8 +11,6 @@ import (
"net/http"
"net/url"
- "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"
)
@@ -119,7 +117,6 @@ func (r *Response) CORSAllowedOrigin(options CORSOptions) bool {
}
parsed, err := url.Parse(origin)
if err != nil {
- err = gerror.WrapCodef(gcode.CodeInvalidParameter, err, `url.Parse failed for URL "%s"`, origin)
return false
}
for _, v := range options.AllowDomain {
diff --git a/net/ghttp/ghttp_response_writer.go b/net/ghttp/ghttp_response_writer.go
index a6aee046a..307e72292 100644
--- a/net/ghttp/ghttp_response_writer.go
+++ b/net/ghttp/ghttp_response_writer.go
@@ -64,7 +64,7 @@ func (w *ResponseWriter) Flush() {
w.buffer.WriteString(http.StatusText(w.Status))
}
if w.buffer.Len() > 0 {
- w.writer.Write(w.buffer.Bytes())
+ _, _ = w.writer.Write(w.buffer.Bytes())
w.buffer.Reset()
}
}
diff --git a/net/ghttp/ghttp_server_config.go b/net/ghttp/ghttp_server_config.go
index 5f30397d8..3daf659e3 100644
--- a/net/ghttp/ghttp_server_config.go
+++ b/net/ghttp/ghttp_server_config.go
@@ -18,7 +18,6 @@ import (
"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/gfile"
"github.com/gogf/gf/v2/os/glog"
diff --git a/net/ghttp/ghttp_server_router.go b/net/ghttp/ghttp_server_router.go
index 20f4cdd76..9e6a98d54 100644
--- a/net/ghttp/ghttp_server_router.go
+++ b/net/ghttp/ghttp_server_router.go
@@ -25,10 +25,6 @@ import (
"github.com/gogf/gf/v2/util/gmeta"
)
-const (
- stackFilterKey = "/net/ghttp/ghttp"
-)
-
var (
// handlerIdGenerator is handler item id generator.
handlerIdGenerator = gtype.NewInt()
diff --git a/net/ghttp/ghttp_server_service_handler.go b/net/ghttp/ghttp_server_service_handler.go
index 9e17523c8..7e34840a1 100644
--- a/net/ghttp/ghttp_server_service_handler.go
+++ b/net/ghttp/ghttp_server_service_handler.go
@@ -83,9 +83,9 @@ func (s *Server) bindHandlerByMap(ctx context.Context, prefix string, m map[stri
func (s *Server) mergeBuildInNameToPattern(pattern string, structName, methodName string, allowAppend bool) string {
structName = s.nameToUri(structName)
methodName = s.nameToUri(methodName)
- pattern = strings.Replace(pattern, "{.struct}", structName, -1)
- if strings.Index(pattern, "{.method}") != -1 {
- return strings.Replace(pattern, "{.method}", methodName, -1)
+ pattern = strings.ReplaceAll(pattern, "{.struct}", structName)
+ if strings.Contains(pattern, "{.method}") {
+ return strings.ReplaceAll(pattern, "{.method}", methodName)
}
if !allowAppend {
return pattern
diff --git a/net/ghttp/ghttp_z_unit_feature_custom_listeners_test.go b/net/ghttp/ghttp_z_unit_feature_custom_listeners_test.go
index 5f277f78e..d6b4c5cf9 100644
--- a/net/ghttp/ghttp_z_unit_feature_custom_listeners_test.go
+++ b/net/ghttp/ghttp_z_unit_feature_custom_listeners_test.go
@@ -12,13 +12,12 @@ import (
"testing"
"time"
+ "github.com/gogf/gf/v2/frame/g"
+ "github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/net/gtcp"
"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/frame/g"
- "github.com/gogf/gf/v2/net/ghttp"
)
func Test_SetSingleCustomListener(t *testing.T) {
diff --git a/net/ghttp/ghttp_z_unit_feature_https_test.go b/net/ghttp/ghttp_z_unit_feature_https_test.go
index f7a62426c..35c269982 100644
--- a/net/ghttp/ghttp_z_unit_feature_https_test.go
+++ b/net/ghttp/ghttp_z_unit_feature_https_test.go
@@ -7,13 +7,14 @@
package ghttp_test
import (
+ _ "github.com/gogf/gf/v2/net/ghttp/testdata/https/packed"
+
"fmt"
"testing"
"time"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
- _ "github.com/gogf/gf/v2/net/ghttp/testdata/https/packed"
"github.com/gogf/gf/v2/net/gtcp"
"github.com/gogf/gf/v2/os/gfile"
"github.com/gogf/gf/v2/os/gtime"
diff --git a/net/ghttp/ghttp_z_unit_feature_router_strict_test.go b/net/ghttp/ghttp_z_unit_feature_router_strict_test.go
index 4fc03a80f..2ae99a638 100644
--- a/net/ghttp/ghttp_z_unit_feature_router_strict_test.go
+++ b/net/ghttp/ghttp_z_unit_feature_router_strict_test.go
@@ -64,6 +64,7 @@ type TestForHandlerWithObjectAndMeta1Req struct {
Age int
Name string
}
+
type TestForHandlerWithObjectAndMeta1Res struct {
Id int
Age int
@@ -74,6 +75,7 @@ type TestForHandlerWithObjectAndMeta2Req struct {
Age int
Name string
}
+
type TestForHandlerWithObjectAndMeta2Res struct {
Id int
Name string
@@ -100,6 +102,7 @@ type TestForHandlerWithObjectAndMeta3Req struct {
Age int
Name string
}
+
type TestForHandlerWithObjectAndMeta3Res struct {
Id int
Age int
@@ -110,6 +113,7 @@ type TestForHandlerWithObjectAndMeta4Req struct {
Age int
Name string
}
+
type TestForHandlerWithObjectAndMeta4Res struct {
Id int
Name string
@@ -130,6 +134,7 @@ func (ControllerForHandlerWithObjectAndMeta2) Test4(ctx context.Context, req *Te
Name: req.Name,
}, nil
}
+
func Test_Router_Handler_Strict_WithObjectAndMeta(t *testing.T) {
s := g.Server(guid.S())
s.Use(ghttp.MiddlewareHandlerResponse)
diff --git a/net/ghttp/ghttp_z_unit_feature_server_util_test.go b/net/ghttp/ghttp_z_unit_feature_server_util_test.go
index 75cfcf125..701966587 100644
--- a/net/ghttp/ghttp_z_unit_feature_server_util_test.go
+++ b/net/ghttp/ghttp_z_unit_feature_server_util_test.go
@@ -29,6 +29,7 @@ func (t *testWrapStdHTTPStruct) ServeHTTP(w http.ResponseWriter, req *http.Reque
w.WriteHeader(http.StatusInternalServerError)
fmt.Fprint(w, t.text)
}
+
func Test_Server_Wrap_Handler(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
s := g.Server(guid.S())
diff --git a/net/ghttp/ghttp_z_unit_feature_websocket_test.go b/net/ghttp/ghttp_z_unit_feature_websocket_test.go
index 916291eda..6d2e09e98 100644
--- a/net/ghttp/ghttp_z_unit_feature_websocket_test.go
+++ b/net/ghttp/ghttp_z_unit_feature_websocket_test.go
@@ -11,11 +11,12 @@ import (
"testing"
"time"
+ "github.com/gorilla/websocket"
+
"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/gorilla/websocket"
)
func Test_WebSocket(t *testing.T) {
diff --git a/net/gipv4/gipv4_ip.go b/net/gipv4/gipv4_ip.go
index be381edfd..95bdb8481 100644
--- a/net/gipv4/gipv4_ip.go
+++ b/net/gipv4/gipv4_ip.go
@@ -12,7 +12,6 @@ import (
"strconv"
"strings"
- "github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
)
@@ -136,7 +135,6 @@ func IsIntranet(ip string) bool {
if array[0] == "172" {
second, err := strconv.ParseInt(array[1], 10, 64)
if err != nil {
- err = gerror.WrapCodef(gcode.CodeInvalidParameter, err, `strconv.ParseInt failed for string "%s"`, array[1])
return false
}
if second >= 16 && second <= 31 {
diff --git a/net/goai/goai.go b/net/goai/goai.go
index 119c29b2f..76d200dae 100644
--- a/net/goai/goai.go
+++ b/net/goai/goai.go
@@ -211,7 +211,7 @@ func (oai *OpenApiV3) golangTypeToOAIFormat(t reflect.Type) string {
func (oai *OpenApiV3) golangTypeToSchemaName(t reflect.Type) string {
var (
- pkgPath = ""
+ pkgPath string
schemaName = gstr.TrimLeft(t.String(), "*")
)
// Pointer type has no PkgPath.
@@ -245,8 +245,5 @@ func formatRefToBytes(ref string) []byte {
}
func isValidParameterName(key string) bool {
- if key == "-" {
- return false
- }
- return true
+ return key != "-"
}
diff --git a/net/goai/goai_path.go b/net/goai/goai_path.go
index 3602927ed..37086e7e4 100644
--- a/net/goai/goai_path.go
+++ b/net/goai/goai_path.go
@@ -7,13 +7,13 @@
package goai
import (
- "github.com/gogf/gf/v2/container/garray"
- "github.com/gogf/gf/v2/os/gstructs"
"reflect"
+ "github.com/gogf/gf/v2/container/garray"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/internal/json"
+ "github.com/gogf/gf/v2/os/gstructs"
"github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/gconv"
"github.com/gogf/gf/v2/util/gmeta"
@@ -311,7 +311,6 @@ func (oai *OpenApiV3) removeOperationDuplicatedProperties(operation Operation) {
}
for _, requestBodyContent := range operation.RequestBody.Value.Content {
-
// Check request body schema
if requestBodyContent.Schema == nil {
continue
diff --git a/net/goai/goai_shema_ref.go b/net/goai/goai_shema_ref.go
index 54103c425..e559860dc 100644
--- a/net/goai/goai_shema_ref.go
+++ b/net/goai/goai_shema_ref.go
@@ -21,18 +21,17 @@ type SchemaRef struct {
}
// isEmbeddedStructDefine checks and returns whether given golang type is embedded struct definition, like:
-// struct A struct{
-// B struct{
-// // ...
-// }
-// }
+//
+// struct A struct{
+// B struct{
+// // ...
+// }
+// }
+//
// The `B` in `A` is called `embedded struct definition`.
func (oai *OpenApiV3) isEmbeddedStructDefinition(golangType reflect.Type) bool {
s := golangType.String()
- if gstr.Contains(s, `struct {`) {
- return true
- }
- return false
+ return gstr.Contains(s, `struct {`)
}
// newSchemaRefWithGolangType creates a new Schema and returns its SchemaRef.
diff --git a/net/gtcp/gtcp_conn.go b/net/gtcp/gtcp_conn.go
index 92eb5a5ce..e01399170 100644
--- a/net/gtcp/gtcp_conn.go
+++ b/net/gtcp/gtcp_conn.go
@@ -100,12 +100,12 @@ func (c *Conn) Send(data []byte, retry ...Retry) error {
// Recv receives and returns data from the connection.
//
// Note that,
-// 1. If length = 0, which means it receives the data from current buffer and returns immediately.
-// 2. If length < 0, which means it receives all data from connection and returns it until no data
-// from connection. Developers should notice the package parsing yourself if you decide receiving
-// all data from buffer.
-// 3. If length > 0, which means it blocks reading data from connection until length size was received.
-// It is the most commonly used length value for data receiving.
+// 1. If length = 0, which means it receives the data from current buffer and returns immediately.
+// 2. If length < 0, which means it receives all data from connection and returns it until no data
+// from connection. Developers should notice the package parsing yourself if you decide receiving
+// all data from buffer.
+// 3. If length > 0, which means it blocks reading data from connection until length size was received.
+// It is the most commonly used length value for data receiving.
func (c *Conn) Recv(length int, retry ...Retry) ([]byte, error) {
var (
err error // Reading error.
@@ -243,7 +243,9 @@ func (c *Conn) RecvWithTimeout(length int, timeout time.Duration, retry ...Retry
if err = c.SetReceiveDeadline(time.Now().Add(timeout)); err != nil {
return nil, err
}
- defer c.SetReceiveDeadline(time.Time{})
+ defer func() {
+ _ = c.SetReceiveDeadline(time.Time{})
+ }()
data, err = c.Recv(length, retry...)
return
}
@@ -253,7 +255,9 @@ func (c *Conn) SendWithTimeout(data []byte, timeout time.Duration, retry ...Retr
if err = c.SetSendDeadline(time.Now().Add(timeout)); err != nil {
return err
}
- defer c.SetSendDeadline(time.Time{})
+ defer func() {
+ _ = c.SetSendDeadline(time.Time{})
+ }()
err = c.Send(data, retry...)
return
}
diff --git a/net/gtcp/gtcp_conn_pkg.go b/net/gtcp/gtcp_conn_pkg.go
index f54ff88ce..700a416d7 100644
--- a/net/gtcp/gtcp_conn_pkg.go
+++ b/net/gtcp/gtcp_conn_pkg.go
@@ -69,7 +69,9 @@ func (c *Conn) SendPkgWithTimeout(data []byte, timeout time.Duration, option ...
if err := c.SetSendDeadline(time.Now().Add(timeout)); err != nil {
return err
}
- defer c.SetSendDeadline(time.Time{})
+ defer func() {
+ _ = c.SetSendDeadline(time.Time{})
+ }()
err = c.SendPkg(data, option...)
return
}
@@ -133,10 +135,12 @@ func (c *Conn) RecvPkg(option ...PkgOption) (result []byte, err error) {
// RecvPkgWithTimeout reads data from connection with timeout using simple package protocol.
func (c *Conn) RecvPkgWithTimeout(timeout time.Duration, option ...PkgOption) (data []byte, err error) {
- if err := c.SetReceiveDeadline(time.Now().Add(timeout)); err != nil {
+ if err = c.SetReceiveDeadline(time.Now().Add(timeout)); err != nil {
return nil, err
}
- defer c.SetReceiveDeadline(time.Time{})
+ defer func() {
+ _ = c.SetReceiveDeadline(time.Time{})
+ }()
data, err = c.RecvPkg(option...)
return
}
diff --git a/net/gtcp/gtcp_pool.go b/net/gtcp/gtcp_pool.go
index bbfe192db..7f312b6d6 100644
--- a/net/gtcp/gtcp_pool.go
+++ b/net/gtcp/gtcp_pool.go
@@ -61,11 +61,9 @@ func NewPoolConn(addr string, timeout ...time.Duration) (*PoolConn, error) {
func (c *PoolConn) Close() error {
if c.pool != nil && c.status == connStatusActive {
c.status = connStatusUnknown
- c.pool.Put(c)
- } else {
- return c.Conn.Close()
+ return c.pool.Put(c)
}
- return nil
+ return c.Conn.Close()
}
// Send writes data to the connection. It retrieves a new connection from its pool if it fails
@@ -128,7 +126,9 @@ func (c *PoolConn) RecvWithTimeout(length int, timeout time.Duration, retry ...R
if err := c.SetReceiveDeadline(time.Now().Add(timeout)); err != nil {
return nil, err
}
- defer c.SetReceiveDeadline(time.Time{})
+ defer func() {
+ _ = c.SetReceiveDeadline(time.Time{})
+ }()
data, err = c.Recv(length, retry...)
return
}
@@ -138,7 +138,9 @@ func (c *PoolConn) SendWithTimeout(data []byte, timeout time.Duration, retry ...
if err := c.SetSendDeadline(time.Now().Add(timeout)); err != nil {
return err
}
- defer c.SetSendDeadline(time.Time{})
+ defer func() {
+ _ = c.SetSendDeadline(time.Time{})
+ }()
err = c.Send(data, retry...)
return
}
diff --git a/net/gtcp/gtcp_pool_pkg.go b/net/gtcp/gtcp_pool_pkg.go
index 1e1eb2f64..a85058144 100644
--- a/net/gtcp/gtcp_pool_pkg.go
+++ b/net/gtcp/gtcp_pool_pkg.go
@@ -46,7 +46,9 @@ func (c *PoolConn) RecvPkgWithTimeout(timeout time.Duration, option ...PkgOption
if err := c.SetReceiveDeadline(time.Now().Add(timeout)); err != nil {
return nil, err
}
- defer c.SetReceiveDeadline(time.Time{})
+ defer func() {
+ _ = c.SetReceiveDeadline(time.Time{})
+ }()
data, err = c.RecvPkg(option...)
return
}
@@ -56,7 +58,9 @@ func (c *PoolConn) SendPkgWithTimeout(data []byte, timeout time.Duration, option
if err := c.SetSendDeadline(time.Now().Add(timeout)); err != nil {
return err
}
- defer c.SetSendDeadline(time.Time{})
+ defer func() {
+ _ = c.SetSendDeadline(time.Time{})
+ }()
err = c.SendPkg(data, option...)
return
}
diff --git a/net/gtcp/gtcp_z_example_test.go b/net/gtcp/gtcp_z_example_test.go
index 2c6ff4663..93dd6a91e 100644
--- a/net/gtcp/gtcp_z_example_test.go
+++ b/net/gtcp/gtcp_z_example_test.go
@@ -8,6 +8,7 @@ package gtcp_test
import (
"fmt"
+
"github.com/gogf/gf/v2/net/gtcp"
)
diff --git a/net/gtcp/gtcp_z_unit_conn_pkg_test.go b/net/gtcp/gtcp_z_unit_conn_pkg_test.go
index b0b7abd65..8b171abe4 100644
--- a/net/gtcp/gtcp_z_unit_conn_pkg_test.go
+++ b/net/gtcp/gtcp_z_unit_conn_pkg_test.go
@@ -12,9 +12,8 @@ import (
"time"
"github.com/gogf/gf/v2/debug/gdebug"
- "github.com/gogf/gf/v2/os/gfile"
-
"github.com/gogf/gf/v2/net/gtcp"
+ "github.com/gogf/gf/v2/os/gfile"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gconv"
)
diff --git a/net/gtcp/gtcp_z_unit_pool_test.go b/net/gtcp/gtcp_z_unit_pool_test.go
index 89ed2eedb..8dbfd84a8 100644
--- a/net/gtcp/gtcp_z_unit_pool_test.go
+++ b/net/gtcp/gtcp_z_unit_pool_test.go
@@ -11,10 +11,9 @@ import (
"testing"
"time"
- "github.com/gogf/gf/v2/text/gstr"
-
"github.com/gogf/gf/v2/net/gtcp"
"github.com/gogf/gf/v2/test/gtest"
+ "github.com/gogf/gf/v2/text/gstr"
)
func Test_Pool_Basic1(t *testing.T) {
diff --git a/net/gtrace/internal/provider/provider.go b/net/gtrace/internal/provider/provider.go
index 66a6d80df..28159d5a1 100644
--- a/net/gtrace/internal/provider/provider.go
+++ b/net/gtrace/internal/provider/provider.go
@@ -17,10 +17,10 @@ type TracerProvider struct {
// New returns a new and configured TracerProvider, which has no SpanProcessor.
//
// In default the returned TracerProvider is configured with:
-// - a ParentBased(AlwaysSample) Sampler
-// - a unix nano timestamp and random umber based IDGenerator
-// - the resource.Default() Resource
-// - the default SpanLimits.
+// - a ParentBased(AlwaysSample) Sampler;
+// - a unix nano timestamp and random umber based IDGenerator;
+// - the resource.Default() Resource;
+// - the default SpanLimits.
//
// The passed opts are used to override these default values and configure the
// returned TracerProvider appropriately.
diff --git a/net/gudp/gudp_conn.go b/net/gudp/gudp_conn.go
index f9683b8dc..6111f092d 100644
--- a/net/gudp/gudp_conn.go
+++ b/net/gudp/gudp_conn.go
@@ -136,11 +136,10 @@ func (c *Conn) Recv(buffer int, retry ...Retry) ([]byte, error) {
// SendRecv writes data to connection and blocks reading response.
func (c *Conn) SendRecv(data []byte, receive int, retry ...Retry) ([]byte, error) {
- if err := c.Send(data, retry...); err == nil {
- return c.Recv(receive, retry...)
- } else {
+ if err := c.Send(data, retry...); err != nil {
return nil, err
}
+ return c.Recv(receive, retry...)
}
// RecvWithTimeout reads data from remote address with timeout.
@@ -148,7 +147,9 @@ func (c *Conn) RecvWithTimeout(length int, timeout time.Duration, retry ...Retry
if err = c.SetRecvDeadline(time.Now().Add(timeout)); err != nil {
return nil, err
}
- defer c.SetRecvDeadline(time.Time{})
+ defer func() {
+ _ = c.SetRecvDeadline(time.Time{})
+ }()
data, err = c.Recv(length, retry...)
return
}
@@ -158,20 +159,22 @@ func (c *Conn) SendWithTimeout(data []byte, timeout time.Duration, retry ...Retr
if err = c.SetSendDeadline(time.Now().Add(timeout)); err != nil {
return err
}
- defer c.SetSendDeadline(time.Time{})
+ defer func() {
+ _ = c.SetSendDeadline(time.Time{})
+ }()
err = c.Send(data, retry...)
return
}
// SendRecvWithTimeout writes data to connection and reads response with timeout.
func (c *Conn) SendRecvWithTimeout(data []byte, receive int, timeout time.Duration, retry ...Retry) ([]byte, error) {
- if err := c.Send(data, retry...); err == nil {
- return c.RecvWithTimeout(receive, timeout, retry...)
- } else {
+ if err := c.Send(data, retry...); err != nil {
return nil, err
}
+ return c.RecvWithTimeout(receive, timeout, retry...)
}
+// SetDeadline sets the read and write deadlines associated with the connection.
func (c *Conn) SetDeadline(t time.Time) (err error) {
if err = c.UDPConn.SetDeadline(t); err == nil {
c.receiveDeadline = t
@@ -182,6 +185,7 @@ func (c *Conn) SetDeadline(t time.Time) (err error) {
return err
}
+// SetRecvDeadline sets the read deadline associated with the connection.
func (c *Conn) SetRecvDeadline(t time.Time) (err error) {
if err = c.SetReadDeadline(t); err == nil {
c.receiveDeadline = t
@@ -209,6 +213,5 @@ func (c *Conn) SetRecvBufferWait(d time.Duration) {
// RemoteAddr returns the remote address of current UDP connection.
// Note that it cannot use c.conn.RemoteAddr() as it is nil.
func (c *Conn) RemoteAddr() net.Addr {
- //return c.conn.RemoteAddr()
return c.remoteAddr
}
diff --git a/net/gudp/gudp_server.go b/net/gudp/gudp_server.go
index cfc4d7e3a..c6dd52b68 100644
--- a/net/gudp/gudp_server.go
+++ b/net/gudp/gudp_server.go
@@ -11,11 +11,10 @@ import (
"net"
"sync"
+ "github.com/gogf/gf/v2/container/gmap"
"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/container/gmap"
"github.com/gogf/gf/v2/util/gconv"
)
diff --git a/os/gcache/gcache_adapter_memory.go b/os/gcache/gcache_adapter_memory.go
index 3bb001b4b..2d0fb6929 100644
--- a/os/gcache/gcache_adapter_memory.go
+++ b/os/gcache/gcache_adapter_memory.go
@@ -205,9 +205,8 @@ func (c *AdapterMemory) GetOrSet(ctx context.Context, key interface{}, value int
}
if v == nil {
return c.doSetWithLockCheck(ctx, key, value, duration)
- } else {
- return v, nil
}
+ return v, nil
}
// GetOrSetFunc retrieves and returns the value of `key`, or sets `key` with result of
@@ -231,9 +230,8 @@ func (c *AdapterMemory) GetOrSetFunc(ctx context.Context, key interface{}, f Fun
return nil, nil
}
return c.doSetWithLockCheck(ctx, key, value, duration)
- } else {
- return v, nil
}
+ return v, nil
}
// GetOrSetFuncLock retrieves and returns the value of `key`, or sets `key` with result of
@@ -253,9 +251,8 @@ func (c *AdapterMemory) GetOrSetFuncLock(ctx context.Context, key interface{}, f
}
if v == nil {
return c.doSetWithLockCheck(ctx, key, f, duration)
- } else {
- return v, nil
}
+ return v, nil
}
// Contains checks and returns true if `key` exists in the cache, or else returns false.
@@ -380,9 +377,8 @@ func (c *AdapterMemory) doSetWithLockCheck(ctx context.Context, key interface{},
func (c *AdapterMemory) getInternalExpire(duration time.Duration) int64 {
if duration == 0 {
return defaultMaxExpire
- } else {
- return gtime.TimestampMilli() + duration.Nanoseconds()/1000000
}
+ return gtime.TimestampMilli() + duration.Nanoseconds()/1000000
}
// makeExpireKey groups the `expire` in milliseconds to its according seconds.
@@ -392,7 +388,7 @@ func (c *AdapterMemory) makeExpireKey(expire int64) int64 {
// syncEventAndClearExpired does the asynchronous task loop:
// 1. Asynchronously process the data in the event list,
-// and synchronize the results to the `expireTimes` and `expireSets` properties.
+// and synchronize the results to the `expireTimes` and `expireSets` properties.
// 2. Clean up the expired key-value pair data.
func (c *AdapterMemory) syncEventAndClearExpired(ctx context.Context) {
if c.closed.Val() {
diff --git a/os/gcache/gcache_adapter_redis.go b/os/gcache/gcache_adapter_redis.go
index 30b0b56cd..a3080e1eb 100644
--- a/os/gcache/gcache_adapter_redis.go
+++ b/os/gcache/gcache_adapter_redis.go
@@ -57,7 +57,7 @@ func (c *AdapterRedis) SetMap(ctx context.Context, data map[interface{}]interfac
index = 0
keys = make([]interface{}, len(data))
)
- for k, _ := range data {
+ for k := range data {
keys[index] = k
index += 1
}
diff --git a/os/gcmd/gcmd_command_run.go b/os/gcmd/gcmd_command_run.go
index 1826257b4..2c0e7f4e7 100644
--- a/os/gcmd/gcmd_command_run.go
+++ b/os/gcmd/gcmd_command_run.go
@@ -13,6 +13,10 @@ import (
"fmt"
"os"
+ "go.opentelemetry.io/otel"
+ "go.opentelemetry.io/otel/propagation"
+ "go.opentelemetry.io/otel/trace"
+
"github.com/gogf/gf/v2"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
@@ -23,9 +27,6 @@ import (
"github.com/gogf/gf/v2/text/gstr"
"github.com/gogf/gf/v2/util/gconv"
"github.com/gogf/gf/v2/util/gutil"
- "go.opentelemetry.io/otel"
- "go.opentelemetry.io/otel/propagation"
- "go.opentelemetry.io/otel/trace"
)
// Run calls custom function that bound to this command.
@@ -191,7 +192,7 @@ func (c *Command) reParse(ctx context.Context, parser *Parser) (*Parser, error)
return nil, err
}
configMap := value.Map()
- for optionName, _ := range parser.supportedOptions {
+ for optionName := range parser.supportedOptions {
// The command line has the high priority.
if parser.GetOpt(optionName) != nil {
continue
diff --git a/os/gcmd/gcmd_parser.go b/os/gcmd/gcmd_parser.go
index 9ad006b2b..406897328 100644
--- a/os/gcmd/gcmd_parser.go
+++ b/os/gcmd/gcmd_parser.go
@@ -171,7 +171,7 @@ func (p *Parser) isOptionValid(name string) bool {
return ok
}
// Case-InSensitive.
- for optionName, _ := range p.supportedOptions {
+ for optionName := range p.supportedOptions {
if gstr.Equal(optionName, name) {
return true
}
@@ -185,7 +185,7 @@ func (p *Parser) isOptionNeedArgument(name string) bool {
// setOptionValue sets the option value for name and according alias.
func (p *Parser) setOptionValue(name, value string) {
- for optionName, _ := range p.passedOptions {
+ for optionName := range p.passedOptions {
array := gstr.SplitAndTrim(optionName, ",")
for _, v := range array {
if strings.EqualFold(v, name) {
diff --git a/os/gcmd/gcmd_z_example_test.go b/os/gcmd/gcmd_z_example_test.go
index d5f661a41..5370191e7 100644
--- a/os/gcmd/gcmd_z_example_test.go
+++ b/os/gcmd/gcmd_z_example_test.go
@@ -9,11 +9,11 @@ package gcmd_test
import (
"context"
"fmt"
- "github.com/gogf/gf/v2/os/gctx"
"os"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gcmd"
+ "github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/os/genv"
)
@@ -139,10 +139,10 @@ func ExampleCommand_AddCommand() {
commandRoot.Print()
// Output:
- //USAGE
+ // USAGE
// gf COMMAND [OPTION]
//
- //COMMAND
+ // COMMAND
// start
}
@@ -176,10 +176,10 @@ func ExampleCommand_AddObject() {
command.Print()
// Output:
- //USAGE
+ // USAGE
// start COMMAND [OPTION]
//
- //COMMAND
+ // COMMAND
// root root env command
}
@@ -209,10 +209,10 @@ func ExampleCommand_Print() {
commandRoot.Print()
// Output:
- //USAGE
+ // USAGE
// gf COMMAND [OPTION]
//
- //COMMAND
+ // COMMAND
// start
}
diff --git a/os/gcmd/gcmd_z_unit_feature_object1_test.go b/os/gcmd/gcmd_z_unit_feature_object1_test.go
index 2ecfb9af0..a80183ce2 100644
--- a/os/gcmd/gcmd_z_unit_feature_object1_test.go
+++ b/os/gcmd/gcmd_z_unit_feature_object1_test.go
@@ -26,12 +26,14 @@ type TestCmdObject struct {
type TestCmdObjectEnvInput struct {
g.Meta `name:"env" usage:"root env" brief:"root env command" dc:"root env command description" ad:"root env command ad"`
}
+
type TestCmdObjectEnvOutput struct{}
type TestCmdObjectTestInput struct {
g.Meta `name:"test" usage:"root test" brief:"root test command" dc:"root test command description" ad:"root test command ad"`
Name string `v:"required" short:"n" orphan:"false" brief:"name for test command"`
}
+
type TestCmdObjectTestOutput struct {
Content string
}
@@ -119,12 +121,14 @@ type TestObjectForRootTag struct {
type TestObjectForRootTagEnvInput struct {
g.Meta `name:"env" usage:"root env" brief:"root env command" dc:"root env command description" ad:"root env command ad"`
}
+
type TestObjectForRootTagEnvOutput struct{}
type TestObjectForRootTagTestInput struct {
g.Meta `name:"root"`
Name string `v:"required" short:"n" orphan:"false" brief:"name for test command"`
}
+
type TestObjectForRootTagTestOutput struct {
Content string
}
@@ -175,6 +179,7 @@ type TestObjectForNeedArgs struct {
type TestObjectForNeedArgsEnvInput struct {
g.Meta `name:"env" usage:"root env" brief:"root env command" dc:"root env command description" ad:"root env command ad"`
}
+
type TestObjectForNeedArgsEnvOutput struct{}
type TestObjectForNeedArgsTestInput struct {
@@ -183,6 +188,7 @@ type TestObjectForNeedArgsTestInput struct {
Arg2 string `arg:"true" brief:"arg2 for test command"`
Name string `v:"required" short:"n" orphan:"false" brief:"name for test command"`
}
+
type TestObjectForNeedArgsTestOutput struct {
Args []string
}
@@ -224,12 +230,14 @@ type TestObjectPointerTag struct {
type TestObjectPointerTagEnvInput struct {
g.Meta `name:"env" usage:"root env" brief:"root env command" dc:"root env command description" ad:"root env command ad"`
}
+
type TestObjectPointerTagEnvOutput struct{}
type TestObjectPointerTagTestInput struct {
g.Meta `name:"root"`
Name string `v:"required" short:"n" orphan:"false" brief:"name for test command"`
}
+
type TestObjectPointerTagTestOutput struct {
Content string
}
@@ -283,6 +291,7 @@ type TestCommandOrphanIndexInput struct {
Orphan2 bool `short:"n2" orphan:"true"`
Orphan3 bool `short:"n3" orphan:"true"`
}
+
type TestCommandOrphanIndexOutput struct {
Orphan1 bool
Orphan2 bool
@@ -297,6 +306,7 @@ func (c *TestCommandOrphan) Index(ctx context.Context, in TestCommandOrphanIndex
}
return
}
+
func Test_Command_Orphan_Parameter(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
var ctx = gctx.New()
diff --git a/os/gcmd/gcmd_z_unit_feature_object2_test.go b/os/gcmd/gcmd_z_unit_feature_object2_test.go
index 1b94778fc..a772ce329 100644
--- a/os/gcmd/gcmd_z_unit_feature_object2_test.go
+++ b/os/gcmd/gcmd_z_unit_feature_object2_test.go
@@ -131,6 +131,7 @@ type commandBuildInput struct {
JsonCase string `short:"j" name:"jsonCase" brief:"{commandGenDaoBriefJsonCase}" d:"CamelLower"`
Pack string `name:"pack" brief:"{commandBuildBriefPack}"`
}
+
type commandBuildOutput struct{}
func (c commandBuild) Index(ctx context.Context, in commandBuildInput) (out *commandBuildOutput, err error) {
diff --git a/os/gcmd/gcmd_z_unit_feature_object3_test.go b/os/gcmd/gcmd_z_unit_feature_object3_test.go
index e388f6fd0..d6c185e1c 100644
--- a/os/gcmd/gcmd_z_unit_feature_object3_test.go
+++ b/os/gcmd/gcmd_z_unit_feature_object3_test.go
@@ -25,6 +25,7 @@ type TestParamsCaseRootInput struct {
g.Meta `name:"root"`
Name string
}
+
type TestParamsCaseRootOutput struct {
Content string
}
diff --git a/os/gcmd/gcmd_z_unit_feature_object4_test.go b/os/gcmd/gcmd_z_unit_feature_object4_test.go
index c94456609..f5ffaf87e 100644
--- a/os/gcmd/gcmd_z_unit_feature_object4_test.go
+++ b/os/gcmd/gcmd_z_unit_feature_object4_test.go
@@ -24,6 +24,7 @@ type TestNoNameTagCase struct {
type TestNoNameTagCaseRootInput struct {
Name string
}
+
type TestNoNameTagCaseRootOutput struct {
Content string
}
diff --git a/os/gcron/gcron_entry.go b/os/gcron/gcron_entry.go
index 154533256..c3f19c604 100644
--- a/os/gcron/gcron_entry.go
+++ b/os/gcron/gcron_entry.go
@@ -137,18 +137,18 @@ func (entry *Entry) Close() {
func (entry *Entry) checkAndRun(ctx context.Context) {
currentTime := time.Now()
if !entry.schedule.checkMeetAndUpdateLastSeconds(ctx, currentTime) {
- //intlog.Printf(
+ // intlog.Printf(
// ctx,
// `timely check, current time does not meet cron job "%s"`,
// entry.getJobNameWithPattern(),
- //)
+ // )
return
}
- //intlog.Printf(
+ // intlog.Printf(
// ctx,
// `timely check, current time meets cron job "%s"`,
// entry.getJobNameWithPattern(),
- //)
+ // )
switch entry.cron.status.Val() {
case StatusStopped:
return
diff --git a/os/gcron/gcron_z_unit_schedule_test.go b/os/gcron/gcron_z_unit_schedule_test.go
index 0714532e7..3b406c41c 100644
--- a/os/gcron/gcron_z_unit_schedule_test.go
+++ b/os/gcron/gcron_z_unit_schedule_test.go
@@ -89,6 +89,7 @@ func TestNext(t *testing.T) {
}
}
}
+
func getTime(value string) time.Time {
if value == "" {
return time.Time{}
diff --git a/os/genv/genv_z_unit_test.go b/os/genv/genv_z_unit_test.go
index 0f9bb2e77..a107dcfa4 100644
--- a/os/genv/genv_z_unit_test.go
+++ b/os/genv/genv_z_unit_test.go
@@ -86,6 +86,7 @@ func Test_GEnv_SetMap(t *testing.T) {
t.AssertEQ(os.Getenv("K2"), "TEST2")
})
}
+
func Test_GEnv_Build(t *testing.T) {
gtest.C(t, func(t *gtest.T) {
s := genv.Build(map[string]string{
diff --git a/os/gfile/gfile_scan.go b/os/gfile/gfile_scan.go
index 9e73e0a82..f3e4bce3d 100644
--- a/os/gfile/gfile_scan.go
+++ b/os/gfile/gfile_scan.go
@@ -153,7 +153,7 @@ func doScanDir(depth int, path string, pattern string, recursive bool, handler f
return nil, err
}
var (
- filePath = ""
+ filePath string
patterns = gstr.SplitAndTrim(pattern, ",")
)
for _, name := range names {
diff --git a/os/gfile/gfile_source.go b/os/gfile/gfile_source.go
index 4f9726633..d77f0b9b9 100644
--- a/os/gfile/gfile_source.go
+++ b/os/gfile/gfile_source.go
@@ -22,7 +22,7 @@ var (
func init() {
if goRootForFilter != "" {
- goRootForFilter = strings.Replace(goRootForFilter, "\\", "/", -1)
+ goRootForFilter = strings.ReplaceAll(goRootForFilter, "\\", "/")
}
}
diff --git a/os/gfsnotify/gfsnotify_watcher_loop.go b/os/gfsnotify/gfsnotify_watcher_loop.go
index 5b6811b1b..59f558fdb 100644
--- a/os/gfsnotify/gfsnotify_watcher_loop.go
+++ b/os/gfsnotify/gfsnotify_watcher_loop.go
@@ -58,7 +58,7 @@ func (w *Watcher) eventLoop() {
// If there's no any callback of this path, it removes it from monitor.
callbacks := w.getCallbacks(event.Path)
if len(callbacks) == 0 {
- w.watcher.Remove(event.Path)
+ _ = w.watcher.Remove(event.Path)
continue
}
switch {
@@ -117,7 +117,6 @@ func (w *Watcher) eventLoop() {
intlog.Printf(context.TODO(), "file creation event, watcher adds monitor for: %s", event.Path)
}
}
-
}
// Calling the callbacks in order.
for _, callback := range callbacks {
diff --git a/os/glog/glog.go b/os/glog/glog.go
index 32b3e5072..9a5a0dd62 100644
--- a/os/glog/glog.go
+++ b/os/glog/glog.go
@@ -4,7 +4,7 @@
// If a copy of the MIT was not distributed with this file,
// You can obtain one at https://github.com/gogf/gf.
-// Package glog implements powerful and easy-to-use levelled logging functionality.
+// Package glog implements powerful and easy-to-use leveled logging functionality.
package glog
import (
diff --git a/os/glog/glog_config.go b/os/glog/glog_config.go
index 7eace27fc..615caa68e 100644
--- a/os/glog/glog_config.go
+++ b/os/glog/glog_config.go
@@ -155,7 +155,7 @@ func SetHandlers(handlers ...Handler) {
defaultLogger.SetHandlers(handlers...)
}
-//SetWriterColorEnable sets the file logging with color
+// SetWriterColorEnable sets the file logging with color
func SetWriterColorEnable(enabled bool) {
defaultLogger.SetWriterColorEnable(enabled)
}
diff --git a/os/glog/glog_logger.go b/os/glog/glog_logger.go
index 262f4c6b8..4bc50ad64 100644
--- a/os/glog/glog_logger.go
+++ b/os/glog/glog_logger.go
@@ -17,11 +17,11 @@ import (
"time"
"github.com/fatih/color"
- "github.com/gogf/gf/v2/internal/consts"
"go.opentelemetry.io/otel/trace"
"github.com/gogf/gf/v2/container/gtype"
"github.com/gogf/gf/v2/debug/gdebug"
+ "github.com/gogf/gf/v2/internal/consts"
"github.com/gogf/gf/v2/internal/intlog"
"github.com/gogf/gf/v2/os/gctx"
"github.com/gogf/gf/v2/os/gfile"
@@ -362,7 +362,6 @@ func (l *Logger) getFilePointer(ctx context.Context, path string) *gfpool.File {
// getFilePointer retrieves and returns a file pointer from file pool.
func (l *Logger) getOpenedFilePointer(ctx context.Context, path string) *gfpool.File {
-
file := gfpool.Get(
path,
defaultFileFlags,
diff --git a/os/glog/glog_logger_rotate.go b/os/glog/glog_logger_rotate.go
index 3e4243f57..b467fb914 100644
--- a/os/glog/glog_logger_rotate.go
+++ b/os/glog/glog_logger_rotate.go
@@ -181,9 +181,7 @@ func (l *Logger) rotateChecksTimely(ctx context.Context) {
if err := l.doRotateFile(ctx, file); err != nil {
intlog.Errorf(ctx, `%+v`, err)
}
-
}()
-
}
}
if expireRotated {
@@ -237,7 +235,7 @@ func (l *Logger) rotateChecksTimely(ctx context.Context) {
// =============================================================
var (
backupFilesMap = make(map[string]*garray.SortedArray)
- originalLoggingFilePath = ""
+ originalLoggingFilePath string
)
if l.config.RotateBackupLimit > 0 || l.config.RotateBackupExpire > 0 {
for _, file := range files {
diff --git a/os/gmutex/gmutex.go b/os/gmutex/gmutex.go
index a0464b6c5..df5e40c49 100644
--- a/os/gmutex/gmutex.go
+++ b/os/gmutex/gmutex.go
@@ -85,10 +85,7 @@ func (m *Mutex) Unlock() {
// It returns true immediately if success, or if there's a write/reading lock on the mutex,
// it returns false immediately.
func (m *Mutex) TryLock() bool {
- if m.state.Cas(0, -1) {
- return true
- }
- return false
+ return m.state.Cas(0, -1)
}
// RLock locks mutex for reading purpose.
diff --git a/os/gproc/gproc.go b/os/gproc/gproc.go
index d088b2b4e..00403774d 100644
--- a/os/gproc/gproc.go
+++ b/os/gproc/gproc.go
@@ -76,7 +76,7 @@ func StartTime() time.Time {
// Uptime returns the duration which current process has been running
func Uptime() time.Duration {
- return time.Now().Sub(processStartTime)
+ return time.Since(processStartTime)
}
// SearchBinary searches the binary `file` in current working folder and PATH environment.
diff --git a/os/gproc/gproc_manager.go b/os/gproc/gproc_manager.go
index f3b525a2f..3fafb11ba 100644
--- a/os/gproc/gproc_manager.go
+++ b/os/gproc/gproc_manager.go
@@ -79,7 +79,7 @@ func (m *Manager) WaitAll() {
processes := m.Processes()
if len(processes) > 0 {
for _, p := range processes {
- p.Wait()
+ _ = p.Wait()
}
}
}
diff --git a/os/gproc/gproc_process.go b/os/gproc/gproc_process.go
index 4b6e7470a..d7920f745 100644
--- a/os/gproc/gproc_process.go
+++ b/os/gproc/gproc_process.go
@@ -14,6 +14,10 @@ import (
"runtime"
"strings"
+ "go.opentelemetry.io/otel"
+ "go.opentelemetry.io/otel/propagation"
+ "go.opentelemetry.io/otel/trace"
+
"github.com/gogf/gf/v2"
"github.com/gogf/gf/v2/errors/gcode"
"github.com/gogf/gf/v2/errors/gerror"
@@ -21,9 +25,6 @@ import (
"github.com/gogf/gf/v2/net/gtrace"
"github.com/gogf/gf/v2/os/genv"
"github.com/gogf/gf/v2/text/gstr"
- "go.opentelemetry.io/otel"
- "go.opentelemetry.io/otel/propagation"
- "go.opentelemetry.io/otel/trace"
)
// Process is the struct for a single process.
diff --git a/os/gproc/gproc_shell.go b/os/gproc/gproc_shell.go
index 6a894aa6d..d39cf402e 100644
--- a/os/gproc/gproc_shell.go
+++ b/os/gproc/gproc_shell.go
@@ -13,10 +13,11 @@ import (
"io"
"runtime"
- "github.com/gogf/gf/v2/os/gfile"
- "github.com/gogf/gf/v2/text/gstr"
"go.opentelemetry.io/otel"
"go.opentelemetry.io/otel/propagation"
+
+ "github.com/gogf/gf/v2/os/gfile"
+ "github.com/gogf/gf/v2/text/gstr"
)
// Shell executes command `cmd` synchronously with given input pipe `in` and output pipe `out`.
diff --git a/os/gproc/gproc_signal.go b/os/gproc/gproc_signal.go
index 4454d8745..35a7207a7 100644
--- a/os/gproc/gproc_signal.go
+++ b/os/gproc/gproc_signal.go
@@ -31,7 +31,7 @@ var (
)
func init() {
- for sig, _ := range shutdownSignalMap {
+ for sig := range shutdownSignalMap {
signalHandlerMap[sig] = make([]SigHandler, 0)
}
}
@@ -51,7 +51,7 @@ func AddSigHandler(handler SigHandler, signals ...os.Signal) {
// syscall.SIGABRT.
func AddSigHandlerShutdown(handler ...SigHandler) {
for _, h := range handler {
- for sig, _ := range shutdownSignalMap {
+ for sig := range shutdownSignalMap {
signalHandlerMap[sig] = append(signalHandlerMap[sig], h)
}
}
@@ -60,7 +60,7 @@ func AddSigHandlerShutdown(handler ...SigHandler) {
// Listen blocks and does signal listening and handling.
func Listen() {
signals := make([]os.Signal, 0)
- for sig, _ := range signalHandlerMap {
+ for sig := range signalHandlerMap {
signals = append(signals, sig)
}
sigChan := make(chan os.Signal, 1)
diff --git a/os/gres/gres_file.go b/os/gres/gres_file.go
index c1e01031c..8e42ed1d3 100644
--- a/os/gres/gres_file.go
+++ b/os/gres/gres_file.go
@@ -12,7 +12,6 @@ import (
"io"
"os"
- "github.com/gogf/gf/v2/errors/gerror"
"github.com/gogf/gf/v2/internal/json"
)
@@ -37,13 +36,11 @@ func (f *File) Open() (io.ReadCloser, error) {
func (f *File) Content() []byte {
reader, err := f.Open()
if err != nil {
- err = gerror.Wrapf(err, `open file failed for name "%s"`, f.Name())
return nil
}
defer reader.Close()
buffer := bytes.NewBuffer(nil)
if _, err = io.Copy(buffer, reader); err != nil {
- err = gerror.Wrapf(err, `read file content failed for name "%s"`, f.Name())
return nil
}
return buffer.Bytes()
diff --git a/os/gres/gres_func.go b/os/gres/gres_func.go
index d2bc6abd6..f26c2fb5b 100644
--- a/os/gres/gres_func.go
+++ b/os/gres/gres_func.go
@@ -45,7 +45,7 @@ type Option struct {
//
// Note that parameter `srcPaths` supports multiple paths join with ','.
//
-// Deprecated, use PackWithOption instead.
+// Deprecated: use PackWithOption instead.
func Pack(srcPaths string, keyPrefix ...string) ([]byte, error) {
option := Option{}
if len(keyPrefix) > 0 && keyPrefix[0] != "" {
@@ -73,7 +73,7 @@ func PackWithOption(srcPaths string, option Option) ([]byte, error) {
//
// Note that parameter `srcPaths` supports multiple paths join with ','.
//
-// Deprecated, use PackToFileWithOption instead.
+// Deprecated: use PackToFileWithOption instead.
func PackToFile(srcPaths, dstPath string, keyPrefix ...string) error {
data, err := Pack(srcPaths, keyPrefix...)
if err != nil {
@@ -101,7 +101,7 @@ func PackToFileWithOption(srcPaths, dstPath string, option Option) error {
//
// Note that parameter `srcPaths` supports multiple paths join with ','.
//
-// Deprecated, use PackToGoFileWithOption instead.
+// Deprecated: use PackToGoFileWithOption instead.
func PackToGoFile(srcPath, goFilePath, pkgName string, keyPrefix ...string) error {
data, err := Pack(srcPath, keyPrefix...)
if err != nil {
diff --git a/os/gres/gres_func_zip.go b/os/gres/gres_func_zip.go
index 23bf17f0f..3ef3395e5 100644
--- a/os/gres/gres_func_zip.go
+++ b/os/gres/gres_func_zip.go
@@ -76,7 +76,7 @@ func doZipPathWriter(srcPath string, zipWriter *zip.Writer, option ...Option) er
headerPrefix = gfile.Basename(absolutePath)
}
}
- headerPrefix = strings.Replace(headerPrefix, `//`, `/`, -1)
+ headerPrefix = strings.ReplaceAll(headerPrefix, `//`, `/`)
for _, file := range files {
// It here calculates the file name prefix, especially packing the directory.
// Eg:
@@ -101,7 +101,7 @@ func doZipPathWriter(srcPath string, zipWriter *zip.Writer, option ...Option) er
tmpPath = headerPrefix
)
for {
- name = strings.Replace(gfile.Basename(tmpPath), `\`, `/`, -1)
+ name = strings.ReplaceAll(gfile.Basename(tmpPath), `\`, `/`)
err = zipFileVirtual(fileinfo.New(name, 0, os.ModeDir|os.ModePerm, time.Now()), tmpPath, zipWriter)
if err != nil {
return err
@@ -118,8 +118,7 @@ func doZipPathWriter(srcPath string, zipWriter *zip.Writer, option ...Option) er
// zipFile compresses the file of given `path` and writes the content to `zw`.
// The parameter `prefix` indicates the path prefix for zip file.
func zipFile(path string, prefix string, zw *zip.Writer) error {
- prefix = strings.Replace(prefix, `//`, `/`, -1)
-
+ prefix = strings.ReplaceAll(prefix, `//`, `/`)
file, err := os.Open(path)
if err != nil {
err = gerror.Wrapf(err, `os.Open failed for path "%s"`, path)
@@ -177,7 +176,7 @@ func createFileHeader(info os.FileInfo, prefix string) (*zip.FileHeader, error)
}
if len(prefix) > 0 {
header.Name = prefix + `/` + header.Name
- header.Name = strings.Replace(header.Name, `\`, `/`, -1)
+ header.Name = strings.ReplaceAll(header.Name, `\`, `/`)
header.Name, _ = gregex.ReplaceString(`/{2,}`, `/`, header.Name)
}
return header, nil
diff --git a/os/gres/gres_resource.go b/os/gres/gres_resource.go
index 0e45eca75..085dfc35e 100644
--- a/os/gres/gres_resource.go
+++ b/os/gres/gres_resource.go
@@ -74,8 +74,8 @@ func (r *Resource) Get(path string) *File {
if path == "" {
return nil
}
- path = strings.Replace(path, "\\", "/", -1)
- path = strings.Replace(path, "//", "/", -1)
+ path = strings.ReplaceAll(path, "\\", "/")
+ path = strings.ReplaceAll(path, "//", "/")
if path != "/" {
for path[len(path)-1] == '/' {
path = path[:len(path)-1]
@@ -94,8 +94,8 @@ func (r *Resource) Get(path string) *File {
// GetWithIndex is usually used for http static file service.
func (r *Resource) GetWithIndex(path string, indexFiles []string) *File {
// Necessary for double char '/' replacement in prefix.
- path = strings.Replace(path, "\\", "/", -1)
- path = strings.Replace(path, "//", "/", -1)
+ path = strings.ReplaceAll(path, "\\", "/")
+ path = strings.ReplaceAll(path, "//", "/")
if path != "/" {
for path[len(path)-1] == '/' {
path = path[:len(path)-1]
@@ -170,8 +170,8 @@ func (r *Resource) ScanDirFile(path string, pattern string, recursive ...bool) [
//
// It scans directory recursively if given parameter `recursive` is true.
func (r *Resource) doScanDir(path string, pattern string, recursive bool, onlyFile bool) []*File {
- path = strings.Replace(path, "\\", "/", -1)
- path = strings.Replace(path, "//", "/", -1)
+ path = strings.ReplaceAll(path, "\\", "/")
+ path = strings.ReplaceAll(path, "//", "/")
if path != "/" {
for path[len(path)-1] == '/' {
path = path[:len(path)-1]
diff --git a/os/gres/gres_z_unit_test.go b/os/gres/gres_z_unit_test.go
index 985a6c5a9..79e905ea9 100644
--- a/os/gres/gres_z_unit_test.go
+++ b/os/gres/gres_z_unit_test.go
@@ -7,11 +7,11 @@
package gres_test
import (
+ _ "github.com/gogf/gf/v2/os/gres/testdata/data"
+
"strings"
"testing"
- _ "github.com/gogf/gf/v2/os/gres/testdata/data"
-
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/os/gfile"
"github.com/gogf/gf/v2/os/gres"
diff --git a/os/gspath/gspath_cache.go b/os/gspath/gspath_cache.go
index 5aba56dd9..1070b0b79 100644
--- a/os/gspath/gspath_cache.go
+++ b/os/gspath/gspath_cache.go
@@ -68,10 +68,10 @@ func (sp *SPath) addToCache(filePath, rootPath string) {
sp.cache.SetIfNotExist(
sp.nameFromPath(filePath, rootPath), sp.makeCacheValue(filePath, idDir),
)
- // If it's a directory, it adds its all sub files/directories recursively.
+ // If it's a directory, it adds all of its sub files/directories.
if idDir {
if files, err := gfile.ScanDir(filePath, "*", true); err == nil {
- //fmt.Println("gspath add to cache:", filePath, files)
+ // fmt.Println("gspath add to cache:", filePath, files)
for _, path := range files {
sp.cache.SetIfNotExist(sp.nameFromPath(path, rootPath), sp.makeCacheValue(path, gfile.IsDir(path)))
}
@@ -89,7 +89,7 @@ func (sp *SPath) addMonitorByPath(path string) {
return
}
_, _ = gfsnotify.Add(path, func(event *gfsnotify.Event) {
- //glog.Debug(event.String())
+ // glog.Debug(event.String())
switch {
case event.IsRemove():
sp.cache.Remove(sp.nameFromPath(event.Path, path))
diff --git a/os/gstructs/gstructs_field.go b/os/gstructs/gstructs_field.go
index 6e28c07c8..74d8ee0d1 100644
--- a/os/gstructs/gstructs_field.go
+++ b/os/gstructs/gstructs_field.go
@@ -191,7 +191,7 @@ func FieldMap(in FieldMapInput) (map[string]Field, error) {
return nil, err
}
var (
- tagValue = ""
+ tagValue string
mapField = make(map[string]Field)
)
for _, field := range fields {
diff --git a/os/gstructs/gstructs_z_unit_test.go b/os/gstructs/gstructs_z_unit_test.go
index ab35666f6..1b814895b 100644
--- a/os/gstructs/gstructs_z_unit_test.go
+++ b/os/gstructs/gstructs_z_unit_test.go
@@ -9,10 +9,8 @@ package gstructs_test
import (
"testing"
- "github.com/gogf/gf/v2/os/gstructs"
-
"github.com/gogf/gf/v2/frame/g"
-
+ "github.com/gogf/gf/v2/os/gstructs"
"github.com/gogf/gf/v2/test/gtest"
)
diff --git a/os/gtime/gtime.go b/os/gtime/gtime.go
index dc9c48d0f..18cc9ddd3 100644
--- a/os/gtime/gtime.go
+++ b/os/gtime/gtime.go
@@ -245,7 +245,7 @@ func StrToTime(str string, format ...string) (*Time, error) {
} else if match = timeRegex2.FindStringSubmatch(str); len(match) > 0 && match[1] != "" {
year, month, day = parseDateStr(match[1])
} else if match = timeRegex3.FindStringSubmatch(str); len(match) > 0 && match[1] != "" {
- s := strings.Replace(match[2], ":", "", -1)
+ s := strings.ReplaceAll(match[2], ":", "")
if len(s) < 6 {
s += strings.Repeat("0", 6-len(s))
}
@@ -263,7 +263,7 @@ func StrToTime(str string, format ...string) (*Time, error) {
// Time
if len(match[2]) > 0 {
- s := strings.Replace(match[2], ":", "", -1)
+ s := strings.ReplaceAll(match[2], ":", "")
if len(s) < 6 {
s += strings.Repeat("0", 6-len(s))
}
@@ -285,7 +285,7 @@ func StrToTime(str string, format ...string) (*Time, error) {
}
// If there's offset in the string, it then firstly processes the offset.
if match[6] != "" {
- zone := strings.Replace(match[6], ":", "", -1)
+ zone := strings.ReplaceAll(match[6], ":", "")
zone = strings.TrimLeft(zone, "+-")
if len(zone) <= 6 {
zone += strings.Repeat("0", 6-len(zone))
@@ -457,7 +457,7 @@ func ParseDuration(s string) (duration time.Duration, err error) {
func FuncCost(f func()) time.Duration {
t := time.Now()
f()
- return time.Now().Sub(t)
+ return time.Since(t)
}
// isTimestampStr checks and returns whether given string a timestamp string.
diff --git a/os/gtime/gtime_format.go b/os/gtime/gtime_format.go
index 62aa5dbc3..6e0898e31 100644
--- a/os/gtime/gtime_format.go
+++ b/os/gtime/gtime_format.go
@@ -101,20 +101,20 @@ func (t *Time) Format(format string) string {
switch runes[i] {
case 'j':
for _, s := range []string{"=j=0", "=j="} {
- result = strings.Replace(result, s, "", -1)
+ result = strings.ReplaceAll(result, s, "")
}
buffer.WriteString(result)
case 'G':
for _, s := range []string{"=G=0", "=G="} {
- result = strings.Replace(result, s, "", -1)
+ result = strings.ReplaceAll(result, s, "")
}
buffer.WriteString(result)
case 'u':
- buffer.WriteString(strings.Replace(result, "=u=.", "", -1))
+ buffer.WriteString(strings.ReplaceAll(result, "=u=.", ""))
case 'w':
buffer.WriteString(weekMap[result])
case 'N':
- buffer.WriteString(strings.Replace(weekMap[result], "0", "7", -1))
+ buffer.WriteString(strings.ReplaceAll(weekMap[result], "0", "7"))
case 'S':
buffer.WriteString(formatMonthDaySuffixMap(result))
default:
diff --git a/os/gtimer/gtimer.go b/os/gtimer/gtimer.go
index 5a00ca264..89e201f6c 100644
--- a/os/gtimer/gtimer.go
+++ b/os/gtimer/gtimer.go
@@ -8,12 +8,12 @@
//
// This package is designed for management for millions of timing jobs. The differences
// between gtimer and gcron are as follows:
-// 1. package gcron is implemented based on package gtimer.
-// 2. gtimer is designed for high performance and for millions of timing jobs.
-// 3. gcron supports configuration pattern grammar like linux crontab, which is more manually
-// readable.
-// 4. gtimer's benchmark OP is measured in nanoseconds, and gcron's benchmark OP is measured
-// in microseconds.
+// 1. package gcron is implemented based on package gtimer.
+// 2. gtimer is designed for high performance and for millions of timing jobs.
+// 3. gcron supports configuration pattern grammar like linux crontab, which is more manually
+// readable.
+// 4. gtimer's benchmark OP is measured in nanoseconds, and gcron's benchmark OP is measured
+// in microseconds.
//
// ALSO VERY NOTE the common delay of the timer: https://github.com/golang/go/issues/14410
package gtimer
@@ -48,13 +48,14 @@ type TimerOptions struct {
type internalPanic string
const (
- StatusReady = 0 // Job or Timer is ready for running.
- StatusRunning = 1 // Job or Timer is already running.
- StatusStopped = 2 // Job or Timer is stopped.
- StatusClosed = -1 // Job or Timer is closed and waiting to be deleted.
- panicExit internalPanic = "exit" // panicExit is used for custom job exit with panic.
- defaultTimerInterval = "100" // defaultTimerInterval is the default timer interval in milliseconds.
- commandEnvKeyForInterval = "gf.gtimer.interval" // commandEnvKeyForInterval is the key for command argument or environment configuring default interval duration for timer.
+ StatusReady = 0 // Job or Timer is ready for running.
+ StatusRunning = 1 // Job or Timer is already running.
+ StatusStopped = 2 // Job or Timer is stopped.
+ StatusClosed = -1 // Job or Timer is closed and waiting to be deleted.
+ panicExit internalPanic = "exit" // panicExit is used for custom job exit with panic.
+ defaultTimerInterval = "100" // defaultTimerInterval is the default timer interval in milliseconds.
+ // commandEnvKeyForInterval is the key for command argument or environment configuring default interval duration for timer.
+ commandEnvKeyForInterval = "gf.gtimer.interval"
)
var (
diff --git a/os/gview/gview.go b/os/gview/gview.go
index 92871f2de..c9de5947d 100644
--- a/os/gview/gview.go
+++ b/os/gview/gview.go
@@ -7,7 +7,7 @@
// Package gview implements a template engine based on text/template.
//
// Reserved template variable names:
-// I18nLanguage: Assign this variable to define i18n language for each page.
+// I18nLanguage: Assign this variable to define i18n language for each page.
package gview
import (
diff --git a/os/gview/gview_i18n.go b/os/gview/gview_i18n.go
index 7b3f93cf7..ca868c09f 100644
--- a/os/gview/gview_i18n.go
+++ b/os/gview/gview_i18n.go
@@ -31,8 +31,8 @@ func (view *View) i18nTranslate(ctx context.Context, content string, variables P
// setI18nLanguageFromCtx retrieves language name from context and sets it to template variables map.
func (view *View) setI18nLanguageFromCtx(ctx context.Context, variables map[string]interface{}) {
- if language, ok := variables[i18nLanguageVariableName]; !ok {
- if language = gi18n.LanguageFromCtx(ctx); language != "" {
+ if _, ok := variables[i18nLanguageVariableName]; !ok {
+ if language := gi18n.LanguageFromCtx(ctx); language != "" {
variables[i18nLanguageVariableName] = language
}
}
diff --git a/test/gtest/gtest_util.go b/test/gtest/gtest_util.go
index c7c4d0f48..ec1c99bc0 100644
--- a/test/gtest/gtest_util.go
+++ b/test/gtest/gtest_util.go
@@ -302,9 +302,6 @@ func compareMap(value, expect interface{}) error {
rvValue = reflect.ValueOf(value)
rvExpect = reflect.ValueOf(expect)
)
- if empty.IsNil(value) {
- value = nil
- }
if rvExpect.Kind() == reflect.Map {
if rvValue.Kind() == reflect.Map {
if rvExpect.Len() == rvValue.Len() {
diff --git a/text/gregex/gregex_z_bench_test.go b/text/gregex/gregex_z_bench_test.go
index ab31344c8..89f2c48e5 100644
--- a/text/gregex/gregex_z_bench_test.go
+++ b/text/gregex/gregex_z_bench_test.go
@@ -16,6 +16,7 @@ import (
)
var pattern = `(\w+).+\-\-\s*(.+)`
+
var src = `GF is best! -- John`
func Benchmark_GF_IsMatchString(b *testing.B) {
diff --git a/text/gstr/gstr_convert.go b/text/gstr/gstr_convert.go
index b34a1e18e..fc29f11cd 100644
--- a/text/gstr/gstr_convert.go
+++ b/text/gstr/gstr_convert.go
@@ -197,14 +197,14 @@ func WordWrap(str string, width int, br string) string {
current = 0
} else {
current += spaceBuf.Len()
- spaceBuf.WriteTo(buf)
+ _, _ = spaceBuf.WriteTo(buf)
}
spaceBuf.Reset()
} else {
current += spaceBuf.Len() + wordBuf.Len()
- spaceBuf.WriteTo(buf)
+ _, _ = spaceBuf.WriteTo(buf)
spaceBuf.Reset()
- wordBuf.WriteTo(buf)
+ _, _ = wordBuf.WriteTo(buf)
wordBuf.Reset()
}
buf.WriteRune(char)
@@ -213,9 +213,9 @@ func WordWrap(str string, width int, br string) string {
case unicode.IsSpace(char):
if spaceBuf.Len() == 0 || wordBuf.Len() > 0 {
current += spaceBuf.Len() + wordBuf.Len()
- spaceBuf.WriteTo(buf)
+ _, _ = spaceBuf.WriteTo(buf)
spaceBuf.Reset()
- wordBuf.WriteTo(buf)
+ _, _ = wordBuf.WriteTo(buf)
wordBuf.Reset()
}
spaceBuf.WriteRune(char)
@@ -224,9 +224,9 @@ func WordWrap(str string, width int, br string) string {
wordBuf.WriteRune(char)
if spaceBuf.Len() == 0 || wordBuf.Len() > 0 {
current += spaceBuf.Len() + wordBuf.Len()
- spaceBuf.WriteTo(buf)
+ _, _ = spaceBuf.WriteTo(buf)
spaceBuf.Reset()
- wordBuf.WriteTo(buf)
+ _, _ = wordBuf.WriteTo(buf)
wordBuf.Reset()
}
@@ -242,11 +242,11 @@ func WordWrap(str string, width int, br string) string {
if wordBuf.Len() == 0 {
if current+spaceBuf.Len() <= width {
- spaceBuf.WriteTo(buf)
+ _, _ = spaceBuf.WriteTo(buf)
}
} else {
- spaceBuf.WriteTo(buf)
- wordBuf.WriteTo(buf)
+ _, _ = spaceBuf.WriteTo(buf)
+ _, _ = wordBuf.WriteTo(buf)
}
return buf.String()
}
diff --git a/text/gstr/gstr_parse.go b/text/gstr/gstr_parse.go
index 4a95780a3..2f5573c87 100644
--- a/text/gstr/gstr_parse.go
+++ b/text/gstr/gstr_parse.go
@@ -24,7 +24,6 @@ import (
// v[][]=m&v[][]=n -> map[v:[map[]]] // Currently does not support nested slice.
// v=m&v[a]=n -> error
// a .[[b=c -> map[a___[b:c]
-//
func Parse(s string) (result map[string]interface{}, err error) {
if s == "" {
return nil, nil
diff --git a/text/gstr/gstr_version.go b/text/gstr/gstr_version.go
index 6b63cde59..d7064513e 100644
--- a/text/gstr/gstr_version.go
+++ b/text/gstr/gstr_version.go
@@ -60,7 +60,7 @@ func CompareVersion(a, b string) int {
var (
array1 = strings.Split(a, ".")
array2 = strings.Split(b, ".")
- diff = 0
+ diff int
)
diff = len(array2) - len(array1)
for i := 0; i < diff; i++ {
@@ -131,7 +131,7 @@ func CompareVersionGo(a, b string) int {
var (
array1 = strings.Split(a, ".")
array2 = strings.Split(b, ".")
- diff = 0
+ diff int
)
// Specially in Golang:
// "v1.12.2-0.20200413154443-b17e3a6804fa" < "v1.12.2"
diff --git a/text/gstr/gstr_z_unit_array_test.go b/text/gstr/gstr_z_unit_array_test.go
index 754feed4b..4945c2284 100644
--- a/text/gstr/gstr_z_unit_array_test.go
+++ b/text/gstr/gstr_z_unit_array_test.go
@@ -9,10 +9,11 @@
package gstr_test
import (
+ "testing"
+
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/text/gstr"
- "testing"
)
func Test_SearchArray(t *testing.T) {
diff --git a/text/gstr/gstr_z_unit_case_test.go b/text/gstr/gstr_z_unit_case_test.go
index 394f605c7..950ec27dc 100644
--- a/text/gstr/gstr_z_unit_case_test.go
+++ b/text/gstr/gstr_z_unit_case_test.go
@@ -7,9 +7,9 @@
package gstr_test
import (
- "github.com/gogf/gf/v2/test/gtest"
"testing"
+ "github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/text/gstr"
)
diff --git a/util/gconv/gconv.go b/util/gconv/gconv.go
index b2de0d507..3a06e2bf4 100644
--- a/util/gconv/gconv.go
+++ b/util/gconv/gconv.go
@@ -79,7 +79,7 @@ func Bytes(any interface{}) []byte {
ok = true
bytes = make([]byte, originValueAndKind.OriginValue.Len())
)
- for i, _ := range bytes {
+ for i := range bytes {
int32Value := Int32(originValueAndKind.OriginValue.Index(i).Interface())
if int32Value < 0 || int32Value > math.MaxUint8 {
ok = false
diff --git a/util/gconv/gconv_scan.go b/util/gconv/gconv_scan.go
index fcad56616..28f7d7b4f 100644
--- a/util/gconv/gconv_scan.go
+++ b/util/gconv/gconv_scan.go
@@ -112,25 +112,30 @@ func Scan(params interface{}, pointer interface{}, mapping ...map[string]string)
// Note that the parameter `structSlicePointer` should be type of *[]struct/*[]*struct.
//
// Usage example 1: Normal attribute struct relation:
-// type EntityUser struct {
-// Uid int
-// Name string
-// }
-// type EntityUserDetail struct {
-// Uid int
-// Address string
-// }
-// type EntityUserScores struct {
-// Id int
-// Uid int
-// Score int
-// Course string
-// }
-// type Entity struct {
-// User *EntityUser
-// UserDetail *EntityUserDetail
-// UserScores []*EntityUserScores
-// }
+//
+// type EntityUser struct {
+// Uid int
+// Name string
+// }
+//
+// type EntityUserDetail struct {
+// Uid int
+// Address string
+// }
+//
+// type EntityUserScores struct {
+// Id int
+// Uid int
+// Score int
+// Course string
+// }
+//
+// type Entity struct {
+// User *EntityUser
+// UserDetail *EntityUserDetail
+// UserScores []*EntityUserScores
+// }
+//
// var users []*Entity
// ScanList(records, &users, "User")
// ScanList(records, &users, "User", "uid")
@@ -138,33 +143,35 @@ func Scan(params interface{}, pointer interface{}, mapping ...map[string]string)
// ScanList(records, &users, "UserScores", "User", "uid:Uid")
// ScanList(records, &users, "UserScores", "User", "uid")
//
-//
// Usage example 2: Embedded attribute struct relation:
-// type EntityUser struct {
-// Uid int
-// Name string
-// }
-// type EntityUserDetail struct {
-// Uid int
-// Address string
-// }
-// type EntityUserScores struct {
-// Id int
-// Uid int
-// Score int
-// }
-// type Entity struct {
-// EntityUser
-// UserDetail EntityUserDetail
-// UserScores []EntityUserScores
-// }
+//
+// type EntityUser struct {
+// Uid int
+// Name string
+// }
+//
+// type EntityUserDetail struct {
+// Uid int
+// Address string
+// }
+//
+// type EntityUserScores struct {
+// Id int
+// Uid int
+// Score int
+// }
+//
+// type Entity struct {
+// EntityUser
+// UserDetail EntityUserDetail
+// UserScores []EntityUserScores
+// }
//
// var users []*Entity
// ScanList(records, &users)
// ScanList(records, &users, "UserDetail", "uid")
// ScanList(records, &users, "UserScores", "uid")
//
-//
// The parameters "User/UserDetail/UserScores" in the example codes specify the target attribute struct
// that current result will be bound to.
//
@@ -191,7 +198,9 @@ func ScanList(structSlice interface{}, structSlicePointer interface{}, bindToAtt
// doScanList converts `structSlice` to struct slice which contains other complex struct attributes recursively.
// Note that the parameter `structSlicePointer` should be type of *[]struct/*[]*struct.
-func doScanList(structSlice interface{}, structSlicePointer interface{}, bindToAttrName, relationAttrName, relationFields string) (err error) {
+func doScanList(
+ structSlice interface{}, structSlicePointer interface{}, bindToAttrName, relationAttrName, relationFields string,
+) (err error) {
var (
maps = Maps(structSlice)
)
diff --git a/util/gconv/gconv_struct.go b/util/gconv/gconv_struct.go
index 8341cc917..ac73fad04 100644
--- a/util/gconv/gconv_struct.go
+++ b/util/gconv/gconv_struct.go
@@ -23,14 +23,14 @@ import (
// custom key name and the attribute name(case-sensitive).
//
// Note:
-// 1. The `params` can be any type of map/struct, usually a map.
-// 2. The `pointer` should be type of *struct/**struct, which is a pointer to struct object
-// or struct pointer.
-// 3. Only the public attributes of struct object can be mapped.
-// 4. If `params` is a map, the key of the map `params` can be lowercase.
-// It will automatically convert the first letter of the key to uppercase
-// in mapping procedure to do the matching.
-// It ignores the map key, if it does not match.
+// 1. The `params` can be any type of map/struct, usually a map.
+// 2. The `pointer` should be type of *struct/**struct, which is a pointer to struct object
+// or struct pointer.
+// 3. Only the public attributes of struct object can be mapped.
+// 4. If `params` is a map, the key of the map `params` can be lowercase.
+// It will automatically convert the first letter of the key to uppercase
+// in mapping procedure to do the matching.
+// It ignores the map key, if it does not match.
func Struct(params interface{}, pointer interface{}, mapping ...map[string]string) (err error) {
return Scan(params, pointer, mapping...)
}
diff --git a/util/gconv/gconv_z_unit_all_test.go b/util/gconv/gconv_z_unit_all_test.go
index d7aeb67bd..563b55e8b 100644
--- a/util/gconv/gconv_z_unit_all_test.go
+++ b/util/gconv/gconv_z_unit_all_test.go
@@ -21,6 +21,7 @@ import (
type iString interface {
String() string
}
+
type S struct {
}
@@ -31,6 +32,7 @@ func (s S) String() string {
type iError interface {
Error() string
}
+
type S1 struct {
}
diff --git a/util/gconv/gconv_z_unit_custom_type_test.go b/util/gconv/gconv_z_unit_custom_type_test.go
index d6b168b63..399fa4bab 100644
--- a/util/gconv/gconv_z_unit_custom_type_test.go
+++ b/util/gconv/gconv_z_unit_custom_type_test.go
@@ -7,11 +7,12 @@
package gconv_test
import (
+ "testing"
+ "time"
+
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gconv"
- "testing"
- "time"
)
type Duration time.Duration
diff --git a/util/gconv/gconv_z_unit_map_test.go b/util/gconv/gconv_z_unit_map_test.go
index 634d0ebd1..4de0d4ac4 100644
--- a/util/gconv/gconv_z_unit_map_test.go
+++ b/util/gconv/gconv_z_unit_map_test.go
@@ -8,13 +8,14 @@ package gconv_test
import (
"encoding/json"
- "github.com/gogf/gf/v2/util/gutil"
- "gopkg.in/yaml.v3"
"testing"
+ "gopkg.in/yaml.v3"
+
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gconv"
+ "github.com/gogf/gf/v2/util/gutil"
)
func Test_Map_Basic(t *testing.T) {
diff --git a/util/gconv/gconv_z_unit_slice_test.go b/util/gconv/gconv_z_unit_slice_test.go
index 7ce358a4f..01083675c 100644
--- a/util/gconv/gconv_z_unit_slice_test.go
+++ b/util/gconv/gconv_z_unit_slice_test.go
@@ -10,7 +10,6 @@ import (
"testing"
"github.com/gogf/gf/v2/container/gvar"
-
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gconv"
diff --git a/util/gconv/gconv_z_unit_struct_marshal_unmarshal_test.go b/util/gconv/gconv_z_unit_struct_marshal_unmarshal_test.go
index b200e732b..7600ef9c4 100644
--- a/util/gconv/gconv_z_unit_struct_marshal_unmarshal_test.go
+++ b/util/gconv/gconv_z_unit_struct_marshal_unmarshal_test.go
@@ -7,6 +7,9 @@
package gconv_test
import (
+ "testing"
+ "time"
+
"github.com/gogf/gf/v2/crypto/gcrc32"
"github.com/gogf/gf/v2/encoding/gbinary"
"github.com/gogf/gf/v2/errors/gerror"
@@ -14,8 +17,6 @@ import (
"github.com/gogf/gf/v2/os/gtime"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gconv"
- "testing"
- "time"
)
type MyTime struct {
diff --git a/util/gconv/gconv_z_unit_struct_tag_test.go b/util/gconv/gconv_z_unit_struct_tag_test.go
index 33a7d0d9b..f1499f73d 100644
--- a/util/gconv/gconv_z_unit_struct_tag_test.go
+++ b/util/gconv/gconv_z_unit_struct_tag_test.go
@@ -7,10 +7,11 @@
package gconv_test
import (
+ "testing"
+
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gconv"
- "testing"
)
func Test_StructTag(t *testing.T) {
diff --git a/util/gconv/gconv_z_unit_time_test.go b/util/gconv/gconv_z_unit_time_test.go
index 1860e91c9..9e585a23f 100644
--- a/util/gconv/gconv_z_unit_time_test.go
+++ b/util/gconv/gconv_z_unit_time_test.go
@@ -7,11 +7,11 @@
package gconv_test
import (
- "github.com/gogf/gf/v2/container/gvar"
- "github.com/gogf/gf/v2/frame/g"
"testing"
"time"
+ "github.com/gogf/gf/v2/container/gvar"
+ "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"
diff --git a/util/gconv/gconv_z_unit_unsafe_test.go b/util/gconv/gconv_z_unit_unsafe_test.go
index 6db82b16e..2fbde4583 100644
--- a/util/gconv/gconv_z_unit_unsafe_test.go
+++ b/util/gconv/gconv_z_unit_unsafe_test.go
@@ -7,9 +7,10 @@
package gconv_test
import (
+ "testing"
+
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gconv"
- "testing"
)
func Test_Unsafe(t *testing.T) {
diff --git a/util/gmeta/gmeta_z_bench_test.go b/util/gmeta/gmeta_z_bench_test.go
index f87136864..e04b2cf65 100644
--- a/util/gmeta/gmeta_z_bench_test.go
+++ b/util/gmeta/gmeta_z_bench_test.go
@@ -7,8 +7,9 @@
package gmeta_test
import (
- "github.com/gogf/gf/v2/util/gmeta"
"testing"
+
+ "github.com/gogf/gf/v2/util/gmeta"
)
type A struct {
diff --git a/util/guid/guid.go b/util/guid/guid.go
index b07dee3dc..80bd6c5ca 100644
--- a/util/guid/guid.go
+++ b/util/guid/guid.go
@@ -68,9 +68,9 @@ func init() {
// 2. CustomData: DataHash(7/14) + TimestampNano(12) + Sequence(3) + RandomString(3/10)
//
// Note that：
-// 1. The returned length is fixed to 32 bytes for performance purpose.
-// 2. The custom parameter `data` composed should have unique attribute in your
-// business scenario.
+// 1. The returned length is fixed to 32 bytes for performance purpose.
+// 2. The custom parameter `data` composed should have unique attribute in your
+// business scenario.
func S(data ...[]byte) string {
var (
b = make([]byte, 32)
diff --git a/util/gutil/gutil_comparator.go b/util/gutil/gutil_comparator.go
index 3ef7b51be..c454cf920 100644
--- a/util/gutil/gutil_comparator.go
+++ b/util/gutil/gutil_comparator.go
@@ -15,9 +15,10 @@ import (
// Comparator is a function that compare a and b, and returns the result as int.
//
// Should return a number:
-// negative , if a < b
-// zero , if a == b
-// positive , if a > b
+//
+// negative , if a < b
+// zero , if a == b
+// positive , if a > b
type Comparator func(a, b interface{}) int
// ComparatorString provides a fast comparison on strings.
diff --git a/util/gutil/gutil_z_unit_dump_test.go b/util/gutil/gutil_z_unit_dump_test.go
index 4ec32d37c..4321d13ea 100755
--- a/util/gutil/gutil_z_unit_dump_test.go
+++ b/util/gutil/gutil_z_unit_dump_test.go
@@ -8,9 +8,9 @@ package gutil_test
import (
"bytes"
- "github.com/gogf/gf/v2/container/gtype"
"testing"
+ "github.com/gogf/gf/v2/container/gtype"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/net/ghttp"
"github.com/gogf/gf/v2/os/gtime"
diff --git a/util/gutil/gutil_z_unit_test.go b/util/gutil/gutil_z_unit_test.go
index 58adc32f5..2195cc210 100755
--- a/util/gutil/gutil_z_unit_test.go
+++ b/util/gutil/gutil_z_unit_test.go
@@ -12,7 +12,6 @@ import (
"testing"
"github.com/gogf/gf/v2/errors/gerror"
-
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/test/gtest"
"github.com/gogf/gf/v2/util/gutil"
diff --git a/util/gvalid/gvalid_z_example_test.go b/util/gvalid/gvalid_z_example_test.go
index e438ce710..d6eceddfb 100644
--- a/util/gvalid/gvalid_z_example_test.go
+++ b/util/gvalid/gvalid_z_example_test.go
@@ -10,6 +10,7 @@ import (
"context"
"errors"
"fmt"
+
"github.com/gogf/gf/v2/container/gvar"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/i18n/gi18n"
diff --git a/util/gvalid/internal/builtin/builtin_phone.go b/util/gvalid/internal/builtin/builtin_phone.go
index 3e0b5dbae..72453dc9f 100644
--- a/util/gvalid/internal/builtin/builtin_phone.go
+++ b/util/gvalid/internal/builtin/builtin_phone.go
@@ -13,25 +13,26 @@ import (
)
// RulePhone implements `phone` rule:
-// 1. China Mobile:
-// 134, 135, 136, 137, 138, 139, 150, 151, 152, 157, 158, 159, 182, 183, 184, 187, 188,
-// 178(4G), 147(Net)；
-// 172
//
-// 2. China Unicom:
-// 130, 131, 132, 155, 156, 185, 186 ,176(4G), 145(Net), 175
+// 1. China Mobile:
+// 134, 135, 136, 137, 138, 139, 150, 151, 152, 157, 158, 159, 182, 183, 184, 187, 188,
+// 178(4G), 147(Net)；
+// 172
//
-// 3. China Telecom:
-// 133, 153, 180, 181, 189, 177(4G)
+// 2. China Unicom:
+// 130, 131, 132, 155, 156, 185, 186 ,176(4G), 145(Net), 175
//
-// 4. Satelite:
-// 1349
+// 3. China Telecom:
+// 133, 153, 180, 181, 189, 177(4G)
//
-// 5. Virtual:
-// 170, 173
+// 4. Satelite:
+// 1349
//
-// 6. 2018:
-// 16x, 19x
+// 5. Virtual:
+// 170, 173
+//
+// 6. 2018:
+// 16x, 19x
//
// Format: phone
type RulePhone struct{}
diff --git a/version.go b/version.go
index 38919cbf4..204166a4d 100644
--- a/version.go
+++ b/version.go
@@ -1,4 +1,8 @@
package gf
-const VERSION = "v2.2.1"
-const AUTHORS = "john"
+const (
+ // VERSION is the current GoFrame version.
+ VERSION = "v2.2.1"
+ // AUTHORS is the authors of GoFrame.
+ AUTHORS = "john"
+)