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/server/web/admin.go
+++ b/server/web/admin.go
@@ -30,7 +30,8 @@ var beeAdminApp *adminApp
 // FilterMonitorFunc is default monitor filter when admin module is enable.
 // if this func returns, admin module records qps for this request by condition of this function logic.
 // usage:
-// 	func MyFilterMonitor(method, requestPath string, t time.Duration, pattern string, statusCode int) bool {
+//
+//	func MyFilterMonitor(method, requestPath string, t time.Duration, pattern string, statusCode int) bool {
 //	 	if method == "POST" {
 //			return false
 //	 	}
@@ -41,8 +42,8 @@ var beeAdminApp *adminApp
 //			return false
 //	 	}
 //	 	return true
-// 	}
-// 	beego.FilterMonitorFunc = MyFilterMonitor.
+//	}
+//	beego.FilterMonitorFunc = MyFilterMonitor.
 var FilterMonitorFunc func(string, string, time.Duration, string, int) bool

 func init() {
--- a/server/web/beego.go
+++ b/server/web/beego.go
@@ -50,8 +50,9 @@ func AddAPPStartHook(hf ...hookfunc) {
 func Run(params ...string) {
 	if len(params) > 0 && params[0] != "" {
 		BeeApp.Run(params[0])
+	} else {
+		BeeApp.Run("")
 	}
-	BeeApp.Run("")
 }

 // RunWithMiddleWares Run beego application with middlewares.
--- a/server/web/captcha/captcha.go
+++ b/server/web/captcha/captcha.go
@@ -19,32 +19,35 @@
 // package controllers
 //
 // import (
-// 	"github.com/beego/beego/v2"
-// 	"github.com/beego/beego/v2/client/cache"
-// 	"github.com/beego/beego/v2/server/web/captcha"
+//
+//	"github.com/beego/beego/v2"
+//	"github.com/beego/beego/v2/client/cache"
+//	"github.com/beego/beego/v2/server/web/captcha"
+//
 // )
 //
 // var cpt *captcha.Captcha
 //
-// func init() {
-// 	// use beego cache system store the captcha data
-// 	store := cache.NewMemoryCache()
-// 	cpt = captcha.NewWithFilter("/captcha/", store)
-// }
+//	func init() {
+//		// use beego cache system store the captcha data
+//		store := cache.NewMemoryCache()
+//		cpt = captcha.NewWithFilter("/captcha/", store)
+//	}
 //
-// type MainController struct {
-// 	beego.Controller
-// }
+//	type MainController struct {
+//		beego.Controller
+//	}
 //
-// func (this *MainController) Get() {
-// 	this.TplName = "index.tpl"
-// }
+//	func (this *MainController) Get() {
+//		this.TplName = "index.tpl"
+//	}
 //
-// func (this *MainController) Post() {
-// 	this.TplName = "index.tpl"
+//	func (this *MainController) Post() {
+//		this.TplName = "index.tpl"
+//
+//		this.Data["Success"] = cpt.VerifyReq(this.Ctx.Request)
+//	}
 //
-// 	this.Data["Success"] = cpt.VerifyReq(this.Ctx.Request)
-// }
 // ```
 //
 // template usage
@@ -52,8 +55,10 @@
 // ```
 // {{.Success}}
 // <form action="/" method="post">
-// 	{{create_captcha}}
-// 	<input name="captcha" type="text">
+//
+//	{{create_captcha}}
+//	<input name="captcha" type="text">
+//
 // </form>
 // ```
 package captcha
--- a/server/web/config.go
+++ b/server/web/config.go
@@ -505,7 +505,7 @@ func defaultRecoverPanic(ctx *context.Context, cfg *Config) {
 				break
 			}
 			logs.Critical(fmt.Sprintf("%s:%d", file, line))
-			stack = stack + fmt.Sprintln(fmt.Sprintf("%s:%d", file, line))
+			stack += fmt.Sprintf("%s:%d\n", file, line)
 		}

 		if ctx.Output.Status != 0 {
@@ -629,7 +629,7 @@ func assignConfig(ac config.Configer) error {
 	for adaptor, cfg := range BConfig.Log.Outputs {
 		err := logs.SetLogger(adaptor, cfg)
 		if err != nil {
-			fmt.Fprintln(os.Stderr, fmt.Sprintf("%s with the config %q got err:%s", adaptor, cfg, err.Error()))
+			fmt.Fprintf(os.Stderr, "%s with the config %q got err:%s\n", adaptor, cfg, err.Error())
 			return err
 		}
 	}
--- a/server/web/context/context.go
+++ b/server/web/context/context.go
@@ -18,7 +18,6 @@
 //	import "github.com/beego/beego/v2/server/web/context"
 //
 //	ctx := context.Context{Request:req,ResponseWriter:rw}
-//
 package context

 import (
--- a/server/web/context/input.go
+++ b/server/web/context/input.go
@@ -19,7 +19,6 @@ import (
 	"compress/gzip"
 	"errors"
 	"io"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/url"
@@ -377,14 +376,14 @@ func (input *BeegoInput) CopyBody(MaxMemory int64) []byte {
 		if err != nil {
 			return nil
 		}
-		requestbody, _ = ioutil.ReadAll(reader)
+		requestbody, _ = io.ReadAll(reader)
 	} else {
-		requestbody, _ = ioutil.ReadAll(safe)
+		requestbody, _ = io.ReadAll(safe)
 	}

 	input.Context.Request.Body.Close()
 	bf := bytes.NewBuffer(requestbody)
-	input.Context.Request.Body = http.MaxBytesReader(input.Context.ResponseWriter, ioutil.NopCloser(bf), MaxMemory)
+	input.Context.Request.Body = http.MaxBytesReader(input.Context.ResponseWriter, io.NopCloser(bf), MaxMemory)
 	input.RequestBody = requestbody
 	return requestbody
 }
--- a/server/web/controller.go
+++ b/server/web/controller.go
@@ -635,31 +635,33 @@ func (c *Controller) GetFile(key string) (multipart.File, *multipart.FileHeader,

 // GetFiles return multi-upload files
 // files, err:=c.GetFiles("myfiles")
+//
 //	if err != nil {
 //		http.Error(w, err.Error(), http.StatusNoContent)
 //		return
 //	}
-// for i, _ := range files {
-//	//for each fileheader, get a handle to the actual file
-//	file, err := files[i].Open()
-//	defer file.Close()
-//	if err != nil {
-//		http.Error(w, err.Error(), http.StatusInternalServerError)
-//		return
+//
+//	for i, _ := range files {
+//		//for each fileheader, get a handle to the actual file
+//		file, err := files[i].Open()
+//		defer file.Close()
+//		if err != nil {
+//			http.Error(w, err.Error(), http.StatusInternalServerError)
+//			return
+//		}
+//		//create destination file making sure the path is writeable.
+//		dst, err := os.Create("upload/" + files[i].Filename)
+//		defer dst.Close()
+//		if err != nil {
+//			http.Error(w, err.Error(), http.StatusInternalServerError)
+//			return
+//		}
+//		//copy the uploaded file to the destination file
+//		if _, err := io.Copy(dst, file); err != nil {
+//			http.Error(w, err.Error(), http.StatusInternalServerError)
+//			return
+//		}
 //	}
-//	//create destination file making sure the path is writeable.
-//	dst, err := os.Create("upload/" + files[i].Filename)
-//	defer dst.Close()
-//	if err != nil {
-//		http.Error(w, err.Error(), http.StatusInternalServerError)
-//		return
-//	}
-//	//copy the uploaded file to the destination file
-//	if _, err := io.Copy(dst, file); err != nil {
-//		http.Error(w, err.Error(), http.StatusInternalServerError)
-//		return
-//	}
-// }
 func (c *Controller) GetFiles(key string) ([]*multipart.FileHeader, error) {
 	if files, ok := c.Ctx.Request.MultipartForm.File[key]; ok {
 		return files, nil
--- a/server/web/controller_test.go
+++ b/server/web/controller_test.go
@@ -17,7 +17,6 @@ package web
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 	"math"
 	"mime/multipart"
 	"net/http"
@@ -321,7 +320,7 @@ func testControllerRespTestCases(t *testing.T, tc respTestCase) {
 		t.Errorf("TestResponse() failed to validate response code for %s", tc.Accept)
 	}

-	bodyBytes, err := ioutil.ReadAll(response.Body)
+	bodyBytes, err := io.ReadAll(response.Body)
 	if err != nil {
 		t.Errorf("TestResponse() failed to parse response body for %s", tc.Accept)
 	}
--- a/server/web/doc.go
+++ b/server/web/doc.go
@@ -11,6 +11,5 @@ beego is inspired by Tornado, Sinatra and Flask with the added benefit of some G
 	func main() {
 	 beego.Run()
 	}
-
 */
 package web
--- a/server/web/error.go
+++ b/server/web/error.go
@@ -386,7 +386,8 @@ func responseError(rw http.ResponseWriter, r *http.Request, errCode int, errCont

 // ErrorHandler registers http.HandlerFunc to each http err code string.
 // usage:
-// 	beego.ErrorHandler("404",NotFound)
+//
+//	beego.ErrorHandler("404",NotFound)
 //	beego.ErrorHandler("500",InternalServerError)
 func ErrorHandler(code string, h http.HandlerFunc) *HttpServer {
 	ErrorMaps[code] = &errorInfo{
@@ -399,7 +400,8 @@ func ErrorHandler(code string, h http.HandlerFunc) *HttpServer {

 // ErrorController registers ControllerInterface to each http err code string.
 // usage:
-// 	beego.ErrorController(&controllers.ErrorController{})
+//
+//	beego.ErrorController(&controllers.ErrorController{})
 func ErrorController(c ControllerInterface) *HttpServer {
 	reflectVal := reflect.ValueOf(c)
 	rt := reflectVal.Type()
--- a/server/web/filter.go
+++ b/server/web/filter.go
@@ -43,8 +43,8 @@ type FilterRouter struct {
 }

 // params is for:
-//   1. setting the returnOnOutput value (false allows multiple filters to execute)
-//   2. determining whether or not params need to be reset.
+//  1. setting the returnOnOutput value (false allows multiple filters to execute)
+//  2. determining whether or not params need to be reset.
 func newFilterRouter(pattern string, filter FilterFunc, opts ...FilterOpt) *FilterRouter {
 	mr := &FilterRouter{
 		tree:       NewTree(),
--- a/server/web/filter/apiauth/apiauth.go
+++ b/server/web/filter/apiauth/apiauth.go
@@ -15,6 +15,7 @@
 // Package apiauth provides handlers to enable apiauth support.
 //
 // Simple Usage:
+//
 //	import(
 //		"github.com/beego/beego/v2"
 //		"github.com/beego/beego/v2/server/web/filter/apiauth"
@@ -37,11 +38,11 @@
 //
 // Information:
 //
-// In the request user should include these params in the query
+// # In the request user should include these params in the query
 //
 // 1. appid
 //
-//		 appid is assigned to the application
+//	appid is assigned to the application
 //
 // 2. signature
 //
@@ -51,8 +52,7 @@
 //
 // 3. timestamp:
 //
-//       send the request time, the format is yyyy-mm-dd HH:ii:ss
-//
+//	send the request time, the format is yyyy-mm-dd HH:ii:ss
 package apiauth

 import (
--- a/server/web/filter/auth/basic.go
+++ b/server/web/filter/auth/basic.go
@@ -14,6 +14,7 @@

 // Package auth provides handlers to enable basic auth support.
 // Simple Usage:
+//
 //	import(
 //		"github.com/beego/beego/v2"
 //		"github.com/beego/beego/v2/server/web/filter/auth"
@@ -25,7 +26,6 @@
 //		beego.Run()
 //	}
 //
-//
 // Advanced Usage:
 //
 //	func SecretAuth(username, password string) bool {
--- a/server/web/filter/authz/authz.go
+++ b/server/web/filter/authz/authz.go
@@ -14,6 +14,7 @@

 // Package authz provides handlers to enable ACL, RBAC, ABAC authorization support.
 // Simple Usage:
+//
 //	import(
 //		"github.com/beego/beego/v2"
 //		"github.com/beego/beego/v2/server/web/filter/authz"
@@ -26,7 +27,6 @@
 //		beego.Run()
 //	}
 //
-//
 // Advanced Usage:
 //
 //	func main(){
--- a/server/web/filter/cors/cors.go
+++ b/server/web/filter/cors/cors.go
@@ -14,9 +14,11 @@

 // Package cors provides handlers to enable CORS support.
 // Usage
+//
 //	import (
-// 		"github.com/beego/beego/v2"
+//		"github.com/beego/beego/v2"
 //		"github.com/beego/beego/v2/server/web/filter/cors"
+//
 // )
 //
 //	func main() {
--- a/server/web/filter/opentracing/filter.go
+++ b/server/web/filter/opentracing/filter.go
@@ -17,8 +17,8 @@ package opentracing
 import (
 	"context"

-	logKit "github.com/go-kit/kit/log"
 	opentracingKit "github.com/go-kit/kit/tracing/opentracing"
+	logKit "github.com/go-kit/log"
 	"github.com/opentracing/opentracing-go"

 	"github.com/beego/beego/v2/server/web"
--- a/server/web/grace/grace.go
+++ b/server/web/grace/grace.go
@@ -18,28 +18,30 @@
 // Usage:
 //
 // import(
-//   "log"
-//	 "net/http"
-//	 "os"
 //
-//   "github.com/beego/beego/v2/server/web/grace"
+//	  "log"
+//		 "net/http"
+//		 "os"
+//
+//	  "github.com/beego/beego/v2/server/web/grace"
+//
 // )
 //
-//  func handler(w http.ResponseWriter, r *http.Request) {
-//	  w.Write([]byte("WORLD!"))
-//  }
+//	 func handler(w http.ResponseWriter, r *http.Request) {
+//		  w.Write([]byte("WORLD!"))
+//	 }
 //
-//  func main() {
-//      mux := http.NewServeMux()
-//      mux.HandleFunc("/hello", handler)
+//	 func main() {
+//	     mux := http.NewServeMux()
+//	     mux.HandleFunc("/hello", handler)
 //
-//	    err := grace.ListenAndServe("localhost:8080", mux)
-//      if err != nil {
-//		   log.Println(err)
-//	    }
-//      log.Println("Server on 8080 stopped")
-//	     os.Exit(0)
-//    }
+//		    err := grace.ListenAndServe("localhost:8080", mux)
+//	     if err != nil {
+//			   log.Println(err)
+//		    }
+//	     log.Println("Server on 8080 stopped")
+//		     os.Exit(0)
+//	   }
 package grace

 import (
--- a/server/web/grace/server.go
+++ b/server/web/grace/server.go
@@ -5,7 +5,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"log"
 	"net"
 	"net/http"
@@ -194,7 +193,7 @@ func (srv *Server) ListenMutualTLS(certFile string, keyFile string, trustFile st
 	srv.TLSConfig.Certificates[0] = cert
 	srv.TLSConfig.ClientAuth = tls.RequireAndVerifyClientCert
 	pool := x509.NewCertPool()
-	data, err := ioutil.ReadFile(trustFile)
+	data, err := os.ReadFile(trustFile)
 	if err != nil {
 		log.Println(err)
 		return nil, err
--- a/server/web/namespace.go
+++ b/server/web/namespace.go
@@ -47,12 +47,14 @@ func NewNamespace(prefix string, params ...LinkNamespace) *Namespace {
 // Cond set condition function
 // if cond return true can run this namespace, else can't
 // usage:
-// ns.Cond(func (ctx *context.Context) bool{
-//       if ctx.Input.Domain() == "api.beego.vip" {
-//         return true
-//       }
-//       return false
-//   })
+//
+//	ns.Cond(func (ctx *context.Context) bool{
+//	      if ctx.Input.Domain() == "api.beego.vip" {
+//	        return true
+//	      }
+//	      return false
+//	  })
+//
 // Cond as the first filter
 func (n *Namespace) Cond(cond namespaceCond) *Namespace {
 	fn := func(ctx *beecontext.Context) {
@@ -77,12 +79,13 @@ func (n *Namespace) Cond(cond namespaceCond) *Namespace {
 // action has before & after
 // FilterFunc
 // usage:
-// Filter("before", func (ctx *context.Context){
-//       _, ok := ctx.Input.Session("uid").(int)
-//       if !ok && ctx.Request.RequestURI != "/login" {
-//          ctx.Redirect(302, "/login")
-//        }
-//   })
+//
+//	Filter("before", func (ctx *context.Context){
+//	      _, ok := ctx.Input.Session("uid").(int)
+//	      if !ok && ctx.Request.RequestURI != "/login" {
+//	         ctx.Redirect(302, "/login")
+//	       }
+//	  })
 func (n *Namespace) Filter(action string, filter ...FilterFunc) *Namespace {
 	var a int
 	if action == "before" {
@@ -239,18 +242,20 @@ func (n *Namespace) CtrlAny(rootpath string, f interface{}) *Namespace {
 // usage:
 // ns := beego.NewNamespace(“/v1”).
 // Namespace(
-//    beego.NewNamespace("/shop").
-//        Get("/:id", func(ctx *context.Context) {
-//            ctx.Output.Body([]byte("shopinfo"))
-//    }),
-//    beego.NewNamespace("/order").
-//        Get("/:id", func(ctx *context.Context) {
-//            ctx.Output.Body([]byte("orderinfo"))
-//    }),
-//    beego.NewNamespace("/crm").
-//        Get("/:id", func(ctx *context.Context) {
-//            ctx.Output.Body([]byte("crminfo"))
-//    }),
+//
+//	beego.NewNamespace("/shop").
+//	    Get("/:id", func(ctx *context.Context) {
+//	        ctx.Output.Body([]byte("shopinfo"))
+//	}),
+//	beego.NewNamespace("/order").
+//	    Get("/:id", func(ctx *context.Context) {
+//	        ctx.Output.Body([]byte("orderinfo"))
+//	}),
+//	beego.NewNamespace("/crm").
+//	    Get("/:id", func(ctx *context.Context) {
+//	        ctx.Output.Body([]byte("crminfo"))
+//	}),
+//
 // )
 func (n *Namespace) Namespace(ns ...*Namespace) *Namespace {
 	for _, ni := range ns {
--- a/server/web/server.go
+++ b/server/web/server.go
@@ -18,7 +18,6 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
-	"io/ioutil"
 	"net"
 	"net/http"
 	"net/http/fcgi"
@@ -257,7 +256,7 @@ func (app *HttpServer) Run(addr string, mws ...MiddleWare) {
 				app.Cfg.Listen.HTTPSCertFile, app.Cfg.Listen.HTTPSKeyFile = "", ""
 			} else if app.Cfg.Listen.EnableMutualHTTPS {
 				pool := x509.NewCertPool()
-				data, err := ioutil.ReadFile(app.Cfg.Listen.TrustCaFile)
+				data, err := os.ReadFile(app.Cfg.Listen.TrustCaFile)
 				if err != nil {
 					logs.Info("MutualHTTPS should provide TrustCaFile")
 					return
--- a/server/web/session/sess_file.go
+++ b/server/web/session/sess_file.go
@@ -18,7 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"os"
 	"path"
@@ -167,7 +167,7 @@ func (fp *FileProvider) SessionRead(ctx context.Context, sid string) (Store, err

 	os.Chtimes(sidPath, time.Now(), time.Now())
 	var kv map[interface{}]interface{}
-	b, err := ioutil.ReadAll(f)
+	b, err := io.ReadAll(f)
 	if err != nil {
 		return nil, err
 	}
@@ -257,7 +257,7 @@ func (fp *FileProvider) SessionRegenerate(ctx context.Context, oldsid, sid strin
 	// 4.return FileSessionStore
 	_, err = os.Stat(oldSidFile)
 	if err == nil {
-		b, err := ioutil.ReadFile(oldSidFile)
+		b, err := os.ReadFile(oldSidFile)
 		if err != nil {
 			return nil, err
 		}
@@ -272,7 +272,7 @@ func (fp *FileProvider) SessionRegenerate(ctx context.Context, oldsid, sid strin
 			}
 		}

-		ioutil.WriteFile(newSidFile, b, 0o777)
+		os.WriteFile(newSidFile, b, 0o777)
 		os.Remove(oldSidFile)
 		os.Chtimes(newSidFile, time.Now(), time.Now())
 		ss := &FileSessionStore{sid: sid, values: kv}
--- a/server/web/session/session.go
+++ b/server/web/session/session.go
@@ -16,14 +16,15 @@
 //
 // Usage:
 // import(
-//   "github.com/beego/beego/v2/server/web/session"
+//
+//	"github.com/beego/beego/v2/server/web/session"
+//
 // )
 //
-//	func init() {
-//      globalSessions, _ = session.NewManager("memory", `{"cookieName":"gosessionid", "enableSetCookie,omitempty": true, "gclifetime":3600, "maxLifetime": 3600, "secure": false, "cookieLifeTime": 3600, "providerConfig": ""}`)
-//		go globalSessions.GC()
-//	}
-//
+//		func init() {
+//	     globalSessions, _ = session.NewManager("memory", `{"cookieName":"gosessionid", "enableSetCookie,omitempty": true, "gclifetime":3600, "maxLifetime": 3600, "secure": false, "cookieLifeTime": 3600, "providerConfig": ""}`)
+//			go globalSessions.GC()
+//		}
 package session

 import (
--- a/server/web/staticfile.go
+++ b/server/web/staticfile.go
@@ -39,12 +39,12 @@ func serverStaticRouter(ctx *context.Context) {
 		return
 	}

-	forbidden, filePath, fileInfo, err := lookupFile(ctx)
+	fbd, filePath, fileInfo, err := lookupFile(ctx)
 	if err == errNotStaticRequest {
 		return
 	}

-	if forbidden {
+	if fbd {
 		exception("403", ctx)
 		return
 	}
--- a/server/web/staticfile_test.go
+++ b/server/web/staticfile_test.go
@@ -6,7 +6,6 @@ import (
 	"compress/zlib"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"testing"
@@ -32,7 +31,7 @@ func testOpenFile(encoding string, content []byte, t *testing.T) {

 func TestOpenStaticFile_1(t *testing.T) {
 	file, _ := os.Open(licenseFile)
-	content, _ := ioutil.ReadAll(file)
+	content, _ := io.ReadAll(file)
 	testOpenFile("", content, t)
 }

@@ -42,7 +41,7 @@ func TestOpenStaticFileGzip_1(t *testing.T) {
 	fileWriter, _ := gzip.NewWriterLevel(&zipBuf, gzip.BestCompression)
 	io.Copy(fileWriter, file)
 	fileWriter.Close()
-	content, _ := ioutil.ReadAll(&zipBuf)
+	content, _ := io.ReadAll(&zipBuf)

 	testOpenFile("gzip", content, t)
 }
@@ -53,7 +52,7 @@ func TestOpenStaticFileDeflate_1(t *testing.T) {
 	fileWriter, _ := zlib.NewWriterLevel(&zipBuf, zlib.BestCompression)
 	io.Copy(fileWriter, file)
 	fileWriter.Close()
-	content, _ := ioutil.ReadAll(&zipBuf)
+	content, _ := io.ReadAll(&zipBuf)

 	testOpenFile("deflate", content, t)
 }
@@ -89,7 +88,7 @@ func assetOpenFileAndContent(sch *serveContentHolder, reader *serveContentReader
 		t.Log("static content file size not same")
 		t.Fail()
 	}
-	bs, _ := ioutil.ReadAll(reader)
+	bs, _ := io.ReadAll(reader)
 	for i, v := range content {
 		if v != bs[i] {
 			t.Log("content not same")
--- a/server/web/template.go
+++ b/server/web/template.go
@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"html/template"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"os"
 	"path/filepath"
@@ -250,7 +249,7 @@ func getTplDeep(root string, fs http.FileSystem, file string, parent string, t *
 		panic("can't find template file:" + file)
 	}
 	defer f.Close()
-	data, err := ioutil.ReadAll(f)
+	data, err := io.ReadAll(f)
 	if err != nil {
 		return nil, [][]string{}, err
 	}
@@ -324,7 +323,7 @@ func _getTemplate(t0 *template.Template, root string, fs http.FileSystem, subMod
 					logs.Trace("template file parse error, not success open file:", err)
 					continue
 				}
-				data, err = ioutil.ReadAll(f)
+				data, err = io.ReadAll(f)
 				f.Close()
 				if err != nil {
 					logs.Trace("template file parse error, not success read file:", err)
--- a/server/web/templatefunc.go
+++ b/server/web/templatefunc.go
@@ -227,21 +227,21 @@ func Htmlunquote(text string) string {
 }

 // URLFor returns url string with another registered controller handler with params.
-//	usage:
 //
-//	URLFor(".index")
-//	print URLFor("index")
-//  router /login
-//	print URLFor("login")
-//	print URLFor("login", "next","/"")
-//  router /profile/:username
-//	print UrlFor("profile", ":username","John Doe")
-//	result:
-//	/
-//	/login
-//	/login?next=/
-//	/user/John%20Doe
+//		usage:
 //
+//		URLFor(".index")
+//		print URLFor("index")
+//	 router /login
+//		print URLFor("login")
+//		print URLFor("login", "next","/"")
+//	 router /profile/:username
+//		print UrlFor("profile", ":username","John Doe")
+//		result:
+//		/
+//		/login
+//		/login?next=/
+//		/user/John%20Doe
 func URLFor(endpoint string, values ...interface{}) string {
 	return BeeApp.Handlers.URLFor(endpoint, values...)
 }
@@ -564,12 +564,13 @@ func ge(arg1, arg2 interface{}) (bool, error) {

 // MapGet getting value from map by keys
 // usage:
-// Data["m"] = M{
-//     "a": 1,
-//     "1": map[string]float64{
-//         "c": 4,
-//     },
-// }
+//
+//	Data["m"] = M{
+//	    "a": 1,
+//	    "1": map[string]float64{
+//	        "c": 4,
+//	    },
+//	}
 //
 // {{ map_get m "a" }} // return 1
 // {{ map_get m 1 "c" }} // return 4