Resolve conflicts among master branch and develop branch (#5286)

* feature extend readthrough for cache module (#5116) * feature 增加readthrough * feature: add write though for cache mode (#5117) * feature: add writethough for cache mode * feature add singleflight cache (#5119) * build(deps): bump go.opentelemetry.io/otel/trace from 1.8.0 to 1.11.2 Bumps [go.opentelemetry.io/otel/trace](https://github.com/open-telemetry/opentelemetry-go) from 1.8.0 to 1.11.2. - [Release notes](https://github.com/open-telemetry/opentelemetry-go/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-go/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-go/compare/v1.8.0...v1.11.2) --- updated-dependencies: - dependency-name: go.opentelemetry.io/otel/trace dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix 5129: must set formatter after init the logger * remove beego.vip * build(deps): bump actions/stale from 5 to 7 Bumps [actions/stale](https://github.com/actions/stale) from 5 to 7. - [Release notes](https://github.com/actions/stale/releases) - [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/stale/compare/v5...v7) --- updated-dependencies: - dependency-name: actions/stale dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix 5079: only log msg when the channel is not closed (#5132) * optimize test * upgrade otel dependencies to v1.11.2 * format code * Bloom filter cache (#5126) * feature: add bloom filter cache * feature upload remove all temp file * bugfix Controller SaveToFile remove all temp file * rft: motify BeeLogger signalChan (#5139) * add non-block write log in asynchronous mode (#5150) * add non-block write log in asynchronous mode --------- Co-authored-by: chenhaokun <chenhaokun@itiger.com> * fix the docsite URL (#5173) * Unified gopkg.in/yaml version to v2 (#5169) * Unified gopkg.in/yaml version to v2 and go mod tidy * update CHANGELOG * bugfix: protect field access with lock to avoid possible data race (#5211) * fix some comments (#5194) Signed-off-by: cui fliter <imcusg@gmail.com> * build(deps): bump github.com/prometheus/client_golang (#5213) Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.14.0 to 1.15.1. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.14.0...v1.15.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump go.etcd.io/etcd/client/v3 from 3.5.4 to 3.5.9 (#5209) Bumps [go.etcd.io/etcd/client/v3](https://github.com/etcd-io/etcd) from 3.5.4 to 3.5.9. - [Release notes](https://github.com/etcd-io/etcd/releases) - [Commits](https://github.com/etcd-io/etcd/compare/v3.5.4...v3.5.9) --- updated-dependencies: - dependency-name: go.etcd.io/etcd/client/v3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * cache: fix typo and optimize the naming * Release 2.1.0 change log * bugfix: beegoAppConfig String and Strings function has bug * httplib: fix unstable test, do not use httplib.org * chore: pkg imported more than once * chore: fmt modify * chore: Use github.com/go-kit/log * chore: unnecessary use of fmt.Sprintf * fix: golangci-lint error * orm: refactor ORM introducing internal/models pkg * remove adapter package * build(deps): bump github.com/bits-and-blooms/bloom/v3 Bumps [github.com/bits-and-blooms/bloom/v3](https://github.com/bits-and-blooms/bloom) from 3.3.1 to 3.5.0. - [Release notes](https://github.com/bits-and-blooms/bloom/releases) - [Commits](https://github.com/bits-and-blooms/bloom/compare/v3.3.1...v3.5.0) --- updated-dependencies: - dependency-name: github.com/bits-and-blooms/bloom/v3 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * feat: add write-delete cache mode * fix: unnecessary assignment to the blank identifier * fix: add change into .CHANGELOG file * build(deps): bump golang.org/x/sync from 0.1.0 to 0.3.0 Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.1.0 to 0.3.0. - [Commits](https://github.com/golang/sync/compare/v0.1.0...v0.3.0) --- updated-dependencies: - dependency-name: golang.org/x/sync dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build(deps): bump golang.org/x/crypto Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.0.0-20220315160706-3147a52a75dd to 0.10.0. - [Commits](https://github.com/golang/crypto/commits/v0.10.0) --- updated-dependencies: - dependency-name: golang.org/x/crypto dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * remove golang--lint-ci * Beego web.Run() runs the server twice * fix 5255: Check the rows.Err() if rows.Next() is false * closes 5254: %COL% should be a common placeholder * build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.15.1 to 1.16.0. - [Release notes](https://github.com/prometheus/client_golang/releases) - [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus/client_golang/compare/v1.15.1...v1.16.0) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * fix: use of ioutil package (#5261) * fix ioutil.NopCloser * fix ioutil.ReadAll * fix ioutil.ReadFile * fix ioutil.WriteFile * run goimports -w -format-only ./ * update CHANGELOG.md * feature: add write-double-delete cache mode (#5263) * cache/redis: support skipEmptyPrefix option (#5264) * fix: refactor InsertValue method (#5267) * fix: refactor insertValue method and add the test * fix: exec goimports and add Licence file header * fix: modify construct method of dbBase * fix: add modify record into CHANGELOG * fix: modify InsertOrUpdate method (#5269) * fix: modify InsertOrUpdate method, Remove the isMulti variable and its associated code * fix: Delete unnecessary judgment branches * fix: add modify record into CHANGELOG * cache/redis: use redisConfig to receive incoming JSON (previously using a map) (#5268) * refactor cache/redis: Use redisConfig to receive incoming JSON (previously using a map). * refactor cache/redis: Use the string type to receive JSON parameters. --------- Co-authored-by: Tan <tanqianheng@gmail.com> * fix: refactor Delete method (#5271) * fix: refactor Delete method and add test * fix: add modify record into CHANGELOG * fix: refactor update sql (#5274) * fix: refactor UpdateSQL method and add test * fix: add modify record into CHANGELOG * fix: modify url in the CHANGELOG * fix: modify pr url in the CHANGELOG * Fix setPK function for table without primary key (#5276) --------- Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: cui fliter <imcusg@gmail.com> Co-authored-by: Stone-afk <73482944+Stone-afk@users.noreply.github.com> Co-authored-by: hookokoko <hooko@tju.edu.cn> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: hookokoko <648646891@qq.com> Co-authored-by: Stone-afk <1711865140@qq.com> Co-authored-by: chenhaokun <chenhaokun@itiger.com> Co-authored-by: Xuing <admin@xuing.cn> Co-authored-by: cui fliter <imcusg@gmail.com> Co-authored-by: guoguangwu <guoguangwu@magic-shield.com> Co-authored-by: uzziah <uzziahlin@gmail.com> Co-authored-by: Hanjiang Yu <delacroix.yu@gmail.com> Co-authored-by: Kota <mdryzk64smsh@gmail.com> Co-authored-by: Uzziah <120019273+uzziahlin@users.noreply.github.com> Co-authored-by: Handkerchiefs-t <59816423+Handkerchiefs-t@users.noreply.github.com> Co-authored-by: Tan <tanqianheng@gmail.com> Co-authored-by: mlgd <mlgd17@gmail.com>
2023-07-31 23:00:02 +08:00
parent 420e11ee63
commit 0bd2df91a1
269 changed files with 3904 additions and 18313 deletions
--- a/core/admin/healthcheck.go
+++ b/core/admin/healthcheck.go
@@ -17,16 +17,15 @@
 // type DatabaseCheck struct {
 // }
 //
-// func (dc *DatabaseCheck) Check() error {
-//	if dc.isConnected() {
-//		return nil
-//	} else {
-//		return errors.New("can't connect database")
-// 	 }
-// }
+//	func (dc *DatabaseCheck) Check() error {
+//		if dc.isConnected() {
+//			return nil
+//		} else {
+//			return errors.New("can't connect database")
+//		 }
+//	}
 //
 // AddHealthCheck("database",&DatabaseCheck{})
-//
 package admin

 // AdminCheckList holds health checker map
--- a/core/config/config.go
+++ b/core/config/config.go
@@ -14,29 +14,31 @@

 // Package config is used to parse config.
 // Usage:
-//  import "github.com/beego/beego/v2/core/config"
+//
+//	import "github.com/beego/beego/v2/core/config"
+//
 // Examples.
 //
-//  cnf, err := config.NewConfig("ini", "config.conf")
+//	cnf, err := config.NewConfig("ini", "config.conf")
 //
-//  cnf APIS:
+//	cnf APIS:
 //
-//  cnf.Set(key, val string) error
-//  cnf.String(key string) string
-//  cnf.Strings(key string) []string
-//  cnf.Int(key string) (int, error)
-//  cnf.Int64(key string) (int64, error)
-//  cnf.Bool(key string) (bool, error)
-//  cnf.Float(key string) (float64, error)
-//  cnf.DefaultString(key string, defaultVal string) string
-//  cnf.DefaultStrings(key string, defaultVal []string) []string
-//  cnf.DefaultInt(key string, defaultVal int) int
-//  cnf.DefaultInt64(key string, defaultVal int64) int64
-//  cnf.DefaultBool(key string, defaultVal bool) bool
-//  cnf.DefaultFloat(key string, defaultVal float64) float64
-//  cnf.DIY(key string) (interface{}, error)
-//  cnf.GetSection(section string) (map[string]string, error)
-//  cnf.SaveConfigFile(filename string) error
+//	cnf.Set(key, val string) error
+//	cnf.String(key string) string
+//	cnf.Strings(key string) []string
+//	cnf.Int(key string) (int, error)
+//	cnf.Int64(key string) (int64, error)
+//	cnf.Bool(key string) (bool, error)
+//	cnf.Float(key string) (float64, error)
+//	cnf.DefaultString(key string, defaultVal string) string
+//	cnf.DefaultStrings(key string, defaultVal []string) []string
+//	cnf.DefaultInt(key string, defaultVal int) int
+//	cnf.DefaultInt64(key string, defaultVal int64) int64
+//	cnf.DefaultBool(key string, defaultVal bool) bool
+//	cnf.DefaultFloat(key string, defaultVal float64) float64
+//	cnf.DIY(key string) (interface{}, error)
+//	cnf.GetSection(section string) (map[string]string, error)
+//	cnf.SaveConfigFile(filename string) error
 package config

 import (
@@ -266,6 +268,7 @@ func ExpandValueEnvForMap(m map[string]interface{}) map[string]interface{} {
 //
 // It accept value formats "${env}" , "${env||}}" , "${env||defaultValue}" , "defaultvalue".
 // Examples:
+//
 //	v1 := config.ExpandValueEnv("${GOPATH}")			// return the GOPATH environment variable.
 //	v2 := config.ExpandValueEnv("${GOAsta||/usr/local/go}")	// return the default value "/usr/local/go/".
 //	v3 := config.ExpandValueEnv("Astaxie")				// return the value "Astaxie".
--- a/core/config/env/env.go
+++ b/core/config/env/env.go
@@ -19,7 +19,6 @@ package env
 import (
 	"fmt"
 	"go/build"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strings"
@@ -119,7 +118,7 @@ func GetRuntimeEnv(key string) (string, error) {
 	}

 	var runtimeEnv string
-	data, err := ioutil.ReadFile(file)
+	data, err := os.ReadFile(file)
 	if err != nil {
 		return "", err
 	}
--- a/core/config/env/env_test.go
+++ b/core/config/env/env_test.go
@@ -5,7 +5,7 @@
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
-//      http://www.apache.org/licenses/LICENSE-2.0
+//	http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
--- a/core/config/ini.go
+++ b/core/config/ini.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"io"
-	"io/ioutil"
 	"os"
 	"os/user"
 	"path/filepath"
@@ -54,7 +53,7 @@ func (ini *IniConfig) Parse(name string) (Configer, error) {
 }

 func (ini *IniConfig) parseFile(name string) (*IniConfigContainer, error) {
-	data, err := ioutil.ReadFile(name)
+	data, err := os.ReadFile(name)
 	if err != nil {
 		return nil, err
 	}
--- a/core/config/ini_test.go
+++ b/core/config/ini_test.go
@@ -16,7 +16,6 @@ package config

 import (
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"testing"
@@ -173,7 +172,7 @@ name=mysql
 	}
 	defer os.Remove(name)

-	if data, err := ioutil.ReadFile(name); err != nil {
+	if data, err := os.ReadFile(name); err != nil {
 		t.Fatal(err)
 	} else {
 		cfgData := string(data)
--- a/core/config/json/json.go
+++ b/core/config/json/json.go
@@ -18,7 +18,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"os"
 	"strconv"
 	"strings"
@@ -40,7 +40,7 @@ func (js *JSONConfig) Parse(filename string) (config.Configer, error) {
 		return nil, err
 	}
 	defer file.Close()
-	content, err := ioutil.ReadAll(file)
+	content, err := io.ReadAll(file)
 	if err != nil {
 		return nil, err
 	}
@@ -99,12 +99,12 @@ func (c *JSONConfigContainer) sub(key string) (map[string]interface{}, error) {
 	}
 	value, ok := c.data[key]
 	if !ok {
-		return nil, errors.New(fmt.Sprintf("key is not found: %s", key))
+		return nil, fmt.Errorf("key is not found: %s", key)
 	}

 	res, ok := value.(map[string]interface{})
 	if !ok {
-		return nil, errors.New(fmt.Sprintf("the type of value is invalid, key: %s", key))
+		return nil, fmt.Errorf("the type of value is invalid, key: %s", key)
 	}
 	return res, nil
 }
--- a/core/config/toml/toml.go
+++ b/core/config/toml/toml.go
@@ -15,7 +15,6 @@
 package toml

 import (
-	"io/ioutil"
 	"os"
 	"strings"

@@ -32,7 +31,7 @@ type Config struct {

 // Parse accepts filename as the parameter
 func (c *Config) Parse(filename string) (config.Configer, error) {
-	ctx, err := ioutil.ReadFile(filename)
+	ctx, err := os.ReadFile(filename)
 	if err != nil {
 		return nil, err
 	}
--- a/core/config/xml/xml.go
+++ b/core/config/xml/xml.go
@@ -19,20 +19,19 @@
 // go install github.com/beego/x2j.
 //
 // Usage:
-//  import(
-//    _ "github.com/beego/beego/v2/core/config/xml"
-//      "github.com/beego/beego/v2/core/config"
-//  )
 //
-//  cnf, err := config.NewConfig("xml", "config.xml")
+//	import(
+//	  _ "github.com/beego/beego/v2/core/config/xml"
+//	    "github.com/beego/beego/v2/core/config"
+//	)
 //
+//	cnf, err := config.NewConfig("xml", "config.xml")
 package xml

 import (
 	"encoding/xml"
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"strings"
@@ -40,9 +39,10 @@ import (

 	"github.com/mitchellh/mapstructure"

+	"github.com/beego/x2j"
+
 	"github.com/beego/beego/v2/core/config"
 	"github.com/beego/beego/v2/core/logs"
-	"github.com/beego/x2j"
 )

 // Config is a xml config parser and implements Config interface.
@@ -52,7 +52,7 @@ type Config struct{}

 // Parse returns a ConfigContainer with parsed xml config map.
 func (xc *Config) Parse(filename string) (config.Configer, error) {
-	context, err := ioutil.ReadFile(filename)
+	context, err := os.ReadFile(filename)
 	if err != nil {
 		return nil, err
 	}
@@ -119,11 +119,11 @@ func (c *ConfigContainer) sub(key string) (map[string]interface{}, error) {
 	}
 	value, ok := c.data[key]
 	if !ok {
-		return nil, errors.New(fmt.Sprintf("the key is not found: %s", key))
+		return nil, fmt.Errorf("the key is not found: %s", key)
 	}
 	res, ok := value.(map[string]interface{})
 	if !ok {
-		return nil, errors.New(fmt.Sprintf("the value of this key is not a structure: %s", key))
+		return nil, fmt.Errorf("the value of this key is not a structure: %s", key)
 	}
 	return res, nil
 }
--- a/core/config/yaml/yaml.go
+++ b/core/config/yaml/yaml.go
@@ -14,19 +14,18 @@

 // Package yaml for config provider
 // Usage:
-//  import(
-//   _ "github.com/beego/beego/v2/core/config/yaml"
-//     "github.com/beego/beego/v2/core/config"
-//  )
 //
-//  cnf, err := config.NewConfig("yaml", "config.yaml")
+//	import(
+//	 _ "github.com/beego/beego/v2/core/config/yaml"
+//	   "github.com/beego/beego/v2/core/config"
+//	)
 //
+//	cnf, err := config.NewConfig("yaml", "config.yaml")
 package yaml

 import (
 	"errors"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strings"
 	"sync"
@@ -66,7 +65,7 @@ func (*Config) ParseData(data []byte) (config.Configer, error) {

 // ReadYmlReader Read yaml file to map.
 func ReadYmlReader(path string) (cnf map[string]interface{}, err error) {
-	buf, err := ioutil.ReadFile(path)
+	buf, err := os.ReadFile(path)
 	if err != nil {
 		return
 	}
--- a/core/logs/alils/log.pb.go
+++ b/core/logs/alils/log.pb.go
@@ -5,12 +5,11 @@ import (
 	"io"
 	"math"

-	"github.com/gogo/protobuf/proto"
 	github_com_gogo_protobuf_proto "github.com/gogo/protobuf/proto"
 )

 // Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
+var _ = github_com_gogo_protobuf_proto.Marshal

 var _ = fmt.Errorf

@@ -34,7 +33,7 @@ type Log struct {
 func (m *Log) Reset() { *m = Log{} }

 // String returns the Compact Log
-func (m *Log) String() string { return proto.CompactTextString(m) }
+func (m *Log) String() string { return github_com_gogo_protobuf_proto.CompactTextString(m) }

 // ProtoMessage not implemented
 func (*Log) ProtoMessage() {}
@@ -66,7 +65,7 @@ type LogContent struct {
 func (m *LogContent) Reset() { *m = LogContent{} }

 // String returns the compact text
-func (m *LogContent) String() string { return proto.CompactTextString(m) }
+func (m *LogContent) String() string { return github_com_gogo_protobuf_proto.CompactTextString(m) }

 // ProtoMessage not implemented
 func (*LogContent) ProtoMessage() {}
@@ -100,7 +99,7 @@ type LogGroup struct {
 func (m *LogGroup) Reset() { *m = LogGroup{} }

 // String returns the compact text
-func (m *LogGroup) String() string { return proto.CompactTextString(m) }
+func (m *LogGroup) String() string { return github_com_gogo_protobuf_proto.CompactTextString(m) }

 // ProtoMessage not implemented
 func (*LogGroup) ProtoMessage() {}
@@ -150,7 +149,7 @@ type LogGroupList struct {
 func (m *LogGroupList) Reset() { *m = LogGroupList{} }

 // String returns compact text
-func (m *LogGroupList) String() string { return proto.CompactTextString(m) }
+func (m *LogGroupList) String() string { return github_com_gogo_protobuf_proto.CompactTextString(m) }

 // ProtoMessage not implemented
 func (*LogGroupList) ProtoMessage() {}
--- a/core/logs/alils/log_project.go
+++ b/core/logs/alils/log_project.go
@@ -9,7 +9,7 @@ package alils
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httputil"
 )
@@ -45,13 +45,13 @@ func (p *LogProject) ListLogStore() (storeNames []string, err error) {
 		"x-sls-bodyrawsize": "0",
 	}

-	uri := fmt.Sprintf("/logstores")
+	uri := "/logstores"
 	r, err := request(p, "GET", uri, h, nil)
 	if err != nil {
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -96,7 +96,7 @@ func (p *LogProject) GetLogStore(name string) (s *LogStore, err error) {
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -156,7 +156,7 @@ func (p *LogProject) CreateLogStore(name string, ttl, shardCnt int) (err error)
 		return
 	}

-	body, err = ioutil.ReadAll(r.Body)
+	body, err = io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -188,7 +188,7 @@ func (p *LogProject) DeleteLogStore(name string) (err error) {
 		return
 	}

-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -239,7 +239,7 @@ func (p *LogProject) UpdateLogStore(name string, ttl, shardCnt int) (err error)
 		return
 	}

-	body, err = ioutil.ReadAll(r.Body)
+	body, err = io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -277,7 +277,7 @@ func (p *LogProject) ListMachineGroup(offset, size int) (m []string, total int,
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -324,7 +324,7 @@ func (p *LogProject) GetMachineGroup(name string) (m *MachineGroup, err error) {
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -369,7 +369,7 @@ func (p *LogProject) CreateMachineGroup(m *MachineGroup) (err error) {
 		return
 	}

-	body, err = ioutil.ReadAll(r.Body)
+	body, err = io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -408,7 +408,7 @@ func (p *LogProject) UpdateMachineGroup(m *MachineGroup) (err error) {
 		return
 	}

-	body, err = ioutil.ReadAll(r.Body)
+	body, err = io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -440,7 +440,7 @@ func (p *LogProject) DeleteMachineGroup(name string) (err error) {
 		return
 	}

-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -477,7 +477,7 @@ func (p *LogProject) ListConfig(offset, size int) (cfgNames []string, total int,
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -522,7 +522,7 @@ func (p *LogProject) GetConfig(name string) (c *LogConfig, err error) {
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -567,7 +567,7 @@ func (p *LogProject) UpdateConfig(c *LogConfig) (err error) {
 		return
 	}

-	body, err = ioutil.ReadAll(r.Body)
+	body, err = io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -606,7 +606,7 @@ func (p *LogProject) CreateConfig(c *LogConfig) (err error) {
 		return
 	}

-	body, err = ioutil.ReadAll(r.Body)
+	body, err = io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -638,7 +638,7 @@ func (p *LogProject) DeleteConfig(name string) (err error) {
 		return
 	}

-	body, err := ioutil.ReadAll(r.Body)
+	body, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -670,7 +670,7 @@ func (p *LogProject) GetAppliedMachineGroups(confName string) (groupNames []stri
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -715,7 +715,7 @@ func (p *LogProject) GetAppliedConfigs(groupName string) (confNames []string, er
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -760,7 +760,7 @@ func (p *LogProject) ApplyConfigToMachineGroup(confName, groupName string) (err
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -792,7 +792,7 @@ func (p *LogProject) RemoveConfigFromMachineGroup(confName, groupName string) (e
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
--- a/core/logs/alils/log_store.go
+++ b/core/logs/alils/log_store.go
@@ -3,7 +3,7 @@ package alils
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httputil"
 	"strconv"
@@ -41,7 +41,7 @@ func (s *LogStore) ListShards() (shardIDs []int, err error) {
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -98,7 +98,7 @@ func (s *LogStore) PutLogs(lg *LogGroup) (err error) {
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -134,7 +134,7 @@ func (s *LogStore) GetCursor(shardID int, from string) (cursor string, err error
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
@@ -185,7 +185,7 @@ func (s *LogStore) GetLogsBytes(shardID int, cursor string,
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
--- a/core/logs/alils/machine_group.go
+++ b/core/logs/alils/machine_group.go
@@ -3,7 +3,7 @@ package alils
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httputil"
 )
@@ -54,7 +54,7 @@ func (m *MachineGroup) ListMachines() (ms []*Machine, total int, err error) {
 		return
 	}

-	buf, err := ioutil.ReadAll(r.Body)
+	buf, err := io.ReadAll(r.Body)
 	if err != nil {
 		return
 	}
--- a/core/logs/es/es.go
+++ b/core/logs/es/es.go
@@ -81,7 +81,7 @@ func (el *esLogger) Init(config string) error {
 	if len(el.Formatter) > 0 {
 		fmtr, ok := logs.GetFormatter(el.Formatter)
 		if !ok {
-			return errors.New(fmt.Sprintf("the formatter with name: %s not found", el.Formatter))
+			return fmt.Errorf("the formatter with name: %s not found", el.Formatter)
 		}
 		el.formatter = fmtr
 	}
--- a/core/logs/file.go
+++ b/core/logs/file.go
@@ -110,15 +110,16 @@ func (w *fileLogWriter) SetFormatter(f LogFormatter) {

 // Init file logger with json config.
 // jsonConfig like:
-//  {
-//  "filename":"logs/beego.log",
-//  "maxLines":10000,
-//  "maxsize":1024,
-//  "daily":true,
-//  "maxDays":15,
-//  "rotate":true,
-//      "perm":"0600"
-//  }
+//
+//	{
+//	"filename":"logs/beego.log",
+//	"maxLines":10000,
+//	"maxsize":1024,
+//	"daily":true,
+//	"maxDays":15,
+//	"rotate":true,
+//	    "perm":"0600"
+//	}
 func (w *fileLogWriter) Init(config string) error {
 	err := json.Unmarshal([]byte(config), w)
 	if err != nil {
--- a/core/logs/file_test.go
+++ b/core/logs/file_test.go
@@ -17,7 +17,6 @@ package logs
 import (
 	"bufio"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"strconv"
 	"testing"
@@ -378,7 +377,7 @@ func testFileDailyRotate(t *testing.T, fn1, fn2 string) {
 		if err != nil {
 			t.FailNow()
 		}
-		content, err := ioutil.ReadFile(file)
+		content, err := os.ReadFile(file)
 		if err != nil {
 			t.FailNow()
 		}
@@ -413,7 +412,7 @@ func testFileHourlyRotate(t *testing.T, fn1, fn2 string) {
 		if err != nil {
 			t.FailNow()
 		}
-		content, err := ioutil.ReadFile(file)
+		content, err := os.ReadFile(file)
 		if err != nil {
 			t.FailNow()
 		}
--- a/core/logs/smtp.go
+++ b/core/logs/smtp.go
@@ -47,6 +47,7 @@ func newSMTPWriter() Logger {

 // Init smtp writer with json config.
 // config like:
+//
 //	{
 //		"username":"example@gmail.com",
 //		"password:"password",
--- a/core/utils/mail.go
+++ b/core/utils/mail.go
@@ -120,7 +120,7 @@ func (e *Email) Bytes() ([]byte, error) {
 		}
 		// Create the body sections
 		if e.Text != "" {
-			header.Set("Content-Type", fmt.Sprintf("text/plain; charset=UTF-8"))
+			header.Set("Content-Type", "text/plain; charset=UTF-8")
 			header.Set("Content-Transfer-Encoding", "quoted-printable")
 			if _, err := subWriter.CreatePart(header); err != nil {
 				return nil, err
@@ -131,7 +131,7 @@ func (e *Email) Bytes() ([]byte, error) {
 			}
 		}
 		if e.HTML != "" {
-			header.Set("Content-Type", fmt.Sprintf("text/html; charset=UTF-8"))
+			header.Set("Content-Type", "text/html; charset=UTF-8")
 			header.Set("Content-Transfer-Encoding", "quoted-printable")
 			if _, err := subWriter.CreatePart(header); err != nil {
 				return nil, err
--- a/core/utils/pagination/doc.go
+++ b/core/utils/pagination/doc.go
@@ -2,53 +2,51 @@
 Package pagination provides utilities to setup a paginator within the
 context of a http request.

-Usage
+# Usage

 In your beego.Controller:

- package controllers
+	package controllers

- import "github.com/beego/beego/v2/core/utils/pagination"
+	import "github.com/beego/beego/v2/core/utils/pagination"

- type PostsController struct {
-   beego.Controller
- }
+	type PostsController struct {
+	  beego.Controller
+	}

- func (this *PostsController) ListAllPosts() {
-     // sets this.Data["paginator"] with the current offset (from the url query param)
-     postsPerPage := 20
-     paginator := pagination.SetPaginator(this.Ctx, postsPerPage, CountPosts())
-
-     // fetch the next 20 posts
-     this.Data["posts"] = ListPostsByOffsetAndLimit(paginator.Offset(), postsPerPage)
- }
+	func (this *PostsController) ListAllPosts() {
+	    // sets this.Data["paginator"] with the current offset (from the url query param)
+	    postsPerPage := 20
+	    paginator := pagination.SetPaginator(this.Ctx, postsPerPage, CountPosts())

+	    // fetch the next 20 posts
+	    this.Data["posts"] = ListPostsByOffsetAndLimit(paginator.Offset(), postsPerPage)
+	}

 In your view templates:

- {{if .paginator.HasPages}}
- <ul class="pagination pagination">
-     {{if .paginator.HasPrev}}
-         <li><a href="{{.paginator.PageLinkFirst}}">{{ i18n .Lang "paginator.first_page"}}</a></li>
-         <li><a href="{{.paginator.PageLinkPrev}}">&laquo;</a></li>
-     {{else}}
-         <li class="disabled"><a>{{ i18n .Lang "paginator.first_page"}}</a></li>
-         <li class="disabled"><a>&laquo;</a></li>
-     {{end}}
-     {{range $index, $page := .paginator.Pages}}
-         <li{{if $.paginator.IsActive .}} class="active"{{end}}>
-             <a href="{{$.paginator.PageLink $page}}">{{$page}}</a>
-         </li>
-     {{end}}
-     {{if .paginator.HasNext}}
-         <li><a href="{{.paginator.PageLinkNext}}">&raquo;</a></li>
-         <li><a href="{{.paginator.PageLinkLast}}">{{ i18n .Lang "paginator.last_page"}}</a></li>
-     {{else}}
-         <li class="disabled"><a>&raquo;</a></li>
-         <li class="disabled"><a>{{ i18n .Lang "paginator.last_page"}}</a></li>
-     {{end}}
- </ul>
- {{end}}
-
+	{{if .paginator.HasPages}}
+	<ul class="pagination pagination">
+	    {{if .paginator.HasPrev}}
+	        <li><a href="{{.paginator.PageLinkFirst}}">{{ i18n .Lang "paginator.first_page"}}</a></li>
+	        <li><a href="{{.paginator.PageLinkPrev}}">&laquo;</a></li>
+	    {{else}}
+	        <li class="disabled"><a>{{ i18n .Lang "paginator.first_page"}}</a></li>
+	        <li class="disabled"><a>&laquo;</a></li>
+	    {{end}}
+	    {{range $index, $page := .paginator.Pages}}
+	        <li{{if $.paginator.IsActive .}} class="active"{{end}}>
+	            <a href="{{$.paginator.PageLink $page}}">{{$page}}</a>
+	        </li>
+	    {{end}}
+	    {{if .paginator.HasNext}}
+	        <li><a href="{{.paginator.PageLinkNext}}">&raquo;</a></li>
+	        <li><a href="{{.paginator.PageLinkLast}}">{{ i18n .Lang "paginator.last_page"}}</a></li>
+	    {{else}}
+	        <li class="disabled"><a>&raquo;</a></li>
+	        <li class="disabled"><a>{{ i18n .Lang "paginator.last_page"}}</a></li>
+	    {{end}}
+	</ul>
+	{{end}}
 */
 package pagination
--- a/core/utils/pagination/paginator.go
+++ b/core/utils/pagination/paginator.go
@@ -78,11 +78,11 @@ func (p *Paginator) Page() int {
 //
 // Usage (in a view template):
 //
-//  {{range $index, $page := .paginator.Pages}}
-//    <li{{if $.paginator.IsActive .}} class="active"{{end}}>
-//      <a href="{{$.paginator.PageLink $page}}">{{$page}}</a>
-//    </li>
-//  {{end}}
+//	{{range $index, $page := .paginator.Pages}}
+//	  <li{{if $.paginator.IsActive .}} class="active"{{end}}>
+//	    <a href="{{$.paginator.PageLink $page}}">{{$page}}</a>
+//	  </li>
+//	{{end}}
 func (p *Paginator) Pages() []int {
 	if p.pageRange == nil && p.nums > 0 {
 		var pages []int
--- a/core/validation/util.go
+++ b/core/validation/util.go
@@ -67,13 +67,15 @@ type CustomFunc func(v *Validation, obj interface{}, key string)

 // AddCustomFunc Add a custom function to validation
 // The name can not be:
-//   Clear
-//   HasErrors
-//   ErrorMap
-//   Error
-//   Check
-//   Valid
-//   NoMatch
+//
+//	Clear
+//	HasErrors
+//	ErrorMap
+//	Error
+//	Check
+//	Valid
+//	NoMatch
+//
 // If the name is same with exists function, it will replace the origin valid function
 func AddCustomFunc(name string, f CustomFunc) error {
 	if unFuncs[name] {
--- a/core/validation/validation.go
+++ b/core/validation/validation.go
@@ -42,7 +42,6 @@
 //			log.Println(v.Error.Key, v.Error.Message)
 //		}
 //	}
-//
 package validation

 import (
--- a/core/validation/validators.go
+++ b/core/validation/validators.go
@@ -64,26 +64,27 @@ var once sync.Once

 // SetDefaultMessage set default messages
 // if not set, the default messages are
-//  "Required":     "Can not be empty",
-//  "Min":          "Minimum is %d",
-//  "Max":          "Maximum is %d",
-//  "Range":        "Range is %d to %d",
-//  "MinSize":      "Minimum size is %d",
-//  "MaxSize":      "Maximum size is %d",
-//  "Length":       "Required length is %d",
-//  "Alpha":        "Must be valid alpha characters",
-//  "Numeric":      "Must be valid numeric characters",
-//  "AlphaNumeric": "Must be valid alpha or numeric characters",
-//  "Match":        "Must match %s",
-//  "NoMatch":      "Must not match %s",
-//  "AlphaDash":    "Must be valid alpha or numeric or dash(-_) characters",
-//  "Email":        "Must be a valid email address",
-//  "IP":           "Must be a valid ip address",
-//  "Base64":       "Must be valid base64 characters",
-//  "Mobile":       "Must be valid mobile number",
-//  "Tel":          "Must be valid telephone number",
-//  "Phone":        "Must be valid telephone or mobile phone number",
-//  "ZipCode":      "Must be valid zipcode",
+//
+//	"Required":     "Can not be empty",
+//	"Min":          "Minimum is %d",
+//	"Max":          "Maximum is %d",
+//	"Range":        "Range is %d to %d",
+//	"MinSize":      "Minimum size is %d",
+//	"MaxSize":      "Maximum size is %d",
+//	"Length":       "Required length is %d",
+//	"Alpha":        "Must be valid alpha characters",
+//	"Numeric":      "Must be valid numeric characters",
+//	"AlphaNumeric": "Must be valid alpha or numeric characters",
+//	"Match":        "Must match %s",
+//	"NoMatch":      "Must not match %s",
+//	"AlphaDash":    "Must be valid alpha or numeric or dash(-_) characters",
+//	"Email":        "Must be a valid email address",
+//	"IP":           "Must be a valid ip address",
+//	"Base64":       "Must be valid base64 characters",
+//	"Mobile":       "Must be valid mobile number",
+//	"Tel":          "Must be valid telephone number",
+//	"Phone":        "Must be valid telephone or mobile phone number",
+//	"ZipCode":      "Must be valid zipcode",
 func SetDefaultMessage(msg map[string]string) {
 	if len(msg) == 0 {
 		return