diff --git a/.travis.yml b/.travis.yml
index 8f6e0399..f625016e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -56,30 +56,9 @@ before_install:
   - docker exec etcd-gcr-v3.3.25 /bin/sh -c "ETCDCTL_API=3 /usr/local/bin/etcdctl put current.serialize.name test"
   - docker exec etcd-gcr-v3.3.25 /bin/sh -c "ETCDCTL_API=3 /usr/local/bin/etcdctl put sub.sub.key1 sub.sub.key"
 install:
-  - go get github.com/lib/pq
-  - go get github.com/go-sql-driver/mysql
-  - go get github.com/mattn/go-sqlite3
-  - go get github.com/bradfitz/gomemcache/memcache
-  - go get github.com/gomodule/redigo/redis
-  - go get github.com/beego/x2j
-  - go get github.com/couchbase/go-couchbase
-  - go get -u github.com/couchbase/gomemcached@master
-  - go get github.com/beego/goyaml2
-  - go get gopkg.in/yaml.v2
-  - go get github.com/belogik/goes
-  - go get github.com/ledisdb/ledisdb
-  - go get github.com/ssdb/gossdb/ssdb
-  - go get github.com/cloudflare/golz4
-  - go get github.com/gogo/protobuf/proto
-  - go get github.com/Knetic/govaluate
-  - go get github.com/casbin/casbin
-  - go get github.com/elazarl/go-bindata-assetfs
-  - go get github.com/OwnLocal/goes
-  - go get github.com/shiena/ansicolor
   - go get -u honnef.co/go/tools/cmd/staticcheck
   - go get -u github.com/mdempsky/unconvert
   - go get -u github.com/gordonklaus/ineffassign
-  - go get -u github.com/go-redis/redis
 before_script:
 
   #  -
@@ -97,7 +76,7 @@ after_script:
 after_success:
   - bash <(curl -s https://codecov.io/bash)
 script:
-  - go test -coverprofile=coverage.txt -covermode=atomic ./...
+  - GO111MODULE=on go test -coverprofile=coverage.txt -covermode=atomic ./...
   - staticcheck -show-ignored -checks "-ST1017,-U1000,-ST1005,-S1034,-S1012,-SA4006,-SA6005,-SA1019,-SA1024" ./
   - unconvert $(go list ./... | grep -v /vendor/)
   - ineffassign .
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4a5971b..e758cec4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
 # developing
+- Fix: /abc.html/aaa match /abc/aaa. [4459](https://github.com/beego/beego/pull/4459)
 - ORM mock. [4407](https://github.com/beego/beego/pull/4407)
 - Add sonar check and ignore test. [4432](https://github.com/beego/beego/pull/4432) [4433](https://github.com/beego/beego/pull/4433)
 - Update changlog.yml to check every PR to develop branch.[4427](https://github.com/beego/beego/pull/4427)
@@ -16,4 +17,5 @@
 - Fix 4444: panic when 404 not found. [4446](https://github.com/beego/beego/pull/4446)
 - Fix 4435: fix panic when controller dir not found. [4452](https://github.com/beego/beego/pull/4452)
 - Fix 4456: Fix router method expression [4456](https://github.com/beego/beego/pull/4456)
+- Remove some `go get` lines in `.travis.yml` file [4469](https://github.com/beego/beego/pull/4469)
 - Fix 4451: support QueryExecutor interface. [4461](https://github.com/beego/beego/pull/4461)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0db745cb..83a7eaea 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -53,7 +53,7 @@ export SSDB_ADDR="192.168.0.105:8888"
 
 ### Pull requests
 
-First of all. beego follow the gitflow. So please send you pull request to **develop-2** branch. We will close the pull
+First of all. beego follow the gitflow. So please send you pull request to **develop** branch. We will close the pull
 request to master branch.
 
 We are always happy to receive pull requests, and do our best to review them as fast as possible. Not sure if that typo
diff --git a/adapter/cache/cache.go b/adapter/cache/cache.go
index f615b26f..1291568c 100644
--- a/adapter/cache/cache.go
+++ b/adapter/cache/cache.go
@@ -16,7 +16,7 @@
 // Usage:
 //
 // import(
-//   "github.com/beego/beego/v2/cache"
+//   "github.com/beego/beego/v2/client/cache"
 // )
 //
 // bm, err := cache.NewCache("memory", `{"interval":60}`)
diff --git a/adapter/cache/memcache/memcache.go b/adapter/cache/memcache/memcache.go
index 16948f65..37b4b282 100644
--- a/adapter/cache/memcache/memcache.go
+++ b/adapter/cache/memcache/memcache.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/cache/memcache"
-//   "github.com/beego/beego/v2/cache"
+//   _ "github.com/beego/beego/v2/client/cache/memcache"
+//   "github.com/beego/beego/v2/client/cache"
 // )
 //
 //  bm, err := cache.NewCache("memcache", `{"conn":"127.0.0.1:11211"}`)
diff --git a/adapter/cache/redis/redis.go b/adapter/cache/redis/redis.go
index bfbeeb9c..003bc6b1 100644
--- a/adapter/cache/redis/redis.go
+++ b/adapter/cache/redis/redis.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/cache/redis"
-//   "github.com/beego/beego/v2/cache"
+//   _ "github.com/beego/beego/v2/client/cache/redis"
+//   "github.com/beego/beego/v2/client/cache"
 // )
 //
 //  bm, err := cache.NewCache("redis", `{"conn":"127.0.0.1:11211"}`)
diff --git a/adapter/config/config.go b/adapter/config/config.go
index a935e281..bf2496fc 100644
--- a/adapter/config/config.go
+++ b/adapter/config/config.go
@@ -14,7 +14,7 @@
 
 // Package config is used to parse config.
 // Usage:
-//  import "github.com/beego/beego/v2/config"
+//  import "github.com/beego/beego/v2/core/config"
 // Examples.
 //
 //  cnf, err := config.NewConfig("ini", "config.conf")
diff --git a/adapter/config/xml/xml.go b/adapter/config/xml/xml.go
index 190cee97..8c623033 100644
--- a/adapter/config/xml/xml.go
+++ b/adapter/config/xml/xml.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 //  import(
-//    _ "github.com/beego/beego/v2/config/xml"
-//      "github.com/beego/beego/v2/config"
+//    _ "github.com/beego/beego/v2/core/config/xml"
+//      "github.com/beego/beego/v2/core/config"
 //  )
 //
 //  cnf, err := config.NewConfig("xml", "config.xml")
diff --git a/adapter/config/yaml/yaml.go b/adapter/config/yaml/yaml.go
index 8d0bb697..538f1178 100644
--- a/adapter/config/yaml/yaml.go
+++ b/adapter/config/yaml/yaml.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 //  import(
-//   _ "github.com/beego/beego/v2/config/yaml"
-//     "github.com/beego/beego/v2/config"
+//   _ "github.com/beego/beego/v2/core/config/yaml"
+//     "github.com/beego/beego/v2/core/config"
 //  )
 //
 //  cnf, err := config.NewConfig("yaml", "config.yaml")
diff --git a/adapter/context/context.go b/adapter/context/context.go
index 16e631fc..bb8f7cd9 100644
--- a/adapter/context/context.go
+++ b/adapter/context/context.go
@@ -15,7 +15,7 @@
 // Package context provide the context utils
 // Usage:
 //
-//	import "github.com/beego/beego/v2/context"
+//	import "github.com/beego/beego/v2/server/web/context"
 //
 //	ctx := context.Context{Request:req,ResponseWriter:rw}
 //
diff --git a/adapter/context/param/conv_test.go b/adapter/context/param/conv_test.go
index c27d385a..cd797250 100644
--- a/adapter/context/param/conv_test.go
+++ b/adapter/context/param/conv_test.go
@@ -23,7 +23,7 @@ import (
 	"github.com/beego/beego/v2/adapter/context"
 )
 
-func Demo(i int)  {
+func Demo(i int) {
 
 }
 
@@ -37,4 +37,3 @@ func TestConvertParams(t *testing.T) {
 	}, reflect.TypeOf(Demo), ctx)
 	assert.Equal(t, int64(11), res[0].Int())
 }
-
diff --git a/adapter/grace/grace.go b/adapter/grace/grace.go
index 6e582bac..de047eb1 100644
--- a/adapter/grace/grace.go
+++ b/adapter/grace/grace.go
@@ -22,7 +22,7 @@
 //	 "net/http"
 //	 "os"
 //
-//   "github.com/beego/beego/v2/grace"
+//   "github.com/beego/beego/v2/server/web/grace"
 // )
 //
 //  func handler(w http.ResponseWriter, r *http.Request) {
diff --git a/adapter/httplib/httplib.go b/adapter/httplib/httplib.go
index 0a182cae..691bf28b 100644
--- a/adapter/httplib/httplib.go
+++ b/adapter/httplib/httplib.go
@@ -15,7 +15,7 @@
 // Package httplib is used as http.Client
 // Usage:
 //
-// import "github.com/beego/beego/v2/httplib"
+// import "github.com/beego/beego/v2/client/httplib"
 //
 //	b := httplib.Post("http://beego.me/")
 //	b.Param("username","astaxie")
diff --git a/adapter/log.go b/adapter/log.go
index 25e82d26..edf101ad 100644
--- a/adapter/log.go
+++ b/adapter/log.go
@@ -23,7 +23,7 @@ import (
 )
 
 // Log levels to control the logging output.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 const (
 	LevelEmergency     = webLog.LevelEmergency
 	LevelAlert         = webLog.LevelAlert
@@ -36,90 +36,90 @@ const (
 )
 
 // BeeLogger references the used application logger.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 var BeeLogger = logs.GetBeeLogger()
 
 // SetLevel sets the global log level used by the simple logger.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func SetLevel(l int) {
 	logs.SetLevel(l)
 }
 
 // SetLogFuncCall set the CallDepth, default is 3
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func SetLogFuncCall(b bool) {
 	logs.SetLogFuncCall(b)
 }
 
 // SetLogger sets a new logger.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func SetLogger(adaptername string, config string) error {
 	return logs.SetLogger(adaptername, config)
 }
 
 // Emergency logs a message at emergency level.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Emergency(v ...interface{}) {
 	logs.Emergency(generateFmtStr(len(v)), v...)
 }
 
 // Alert logs a message at alert level.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Alert(v ...interface{}) {
 	logs.Alert(generateFmtStr(len(v)), v...)
 }
 
 // Critical logs a message at critical level.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Critical(v ...interface{}) {
 	logs.Critical(generateFmtStr(len(v)), v...)
 }
 
 // Error logs a message at error level.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Error(v ...interface{}) {
 	logs.Error(generateFmtStr(len(v)), v...)
 }
 
 // Warning logs a message at warning level.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Warning(v ...interface{}) {
 	logs.Warning(generateFmtStr(len(v)), v...)
 }
 
 // Warn compatibility alias for Warning()
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Warn(v ...interface{}) {
 	logs.Warn(generateFmtStr(len(v)), v...)
 }
 
 // Notice logs a message at notice level.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Notice(v ...interface{}) {
 	logs.Notice(generateFmtStr(len(v)), v...)
 }
 
 // Informational logs a message at info level.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Informational(v ...interface{}) {
 	logs.Informational(generateFmtStr(len(v)), v...)
 }
 
 // Info compatibility alias for Warning()
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Info(v ...interface{}) {
 	logs.Info(generateFmtStr(len(v)), v...)
 }
 
 // Debug logs a message at debug level.
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Debug(v ...interface{}) {
 	logs.Debug(generateFmtStr(len(v)), v...)
 }
 
 // Trace logs a message at trace level.
 // compatibility alias for Warning()
-// Deprecated: use github.com/beego/beego/v2/logs instead.
+// Deprecated: use github.com/beego/beego/v2/core/logs instead.
 func Trace(v ...interface{}) {
 	logs.Trace(generateFmtStr(len(v)), v...)
 }
diff --git a/adapter/logs/log.go b/adapter/logs/log.go
index 9d098d8f..d53cc2ce 100644
--- a/adapter/logs/log.go
+++ b/adapter/logs/log.go
@@ -15,7 +15,7 @@
 // Package logs provide a general log interface
 // Usage:
 //
-// import "github.com/beego/beego/v2/logs"
+// import "github.com/beego/beego/v2/core/logs"
 //
 //	log := NewLogger(10000)
 //	log.SetLogger("console", "")
diff --git a/adapter/orm/models_boot_test.go b/adapter/orm/models_boot_test.go
index 37dbfabd..5471885b 100644
--- a/adapter/orm/models_boot_test.go
+++ b/adapter/orm/models_boot_test.go
@@ -25,6 +25,7 @@ type User struct {
 type Seller struct {
 	Id int
 }
+
 func TestRegisterModelWithPrefix(t *testing.T) {
 	RegisterModelWithPrefix("test", &User{}, &Seller{})
 }
diff --git a/adapter/orm/orm.go b/adapter/orm/orm.go
index c603de2f..f3283fd4 100644
--- a/adapter/orm/orm.go
+++ b/adapter/orm/orm.go
@@ -21,7 +21,7 @@
 //
 //	import (
 //		"fmt"
-//		"github.com/beego/beego/v2/orm"
+//		"github.com/beego/beego/v2/client/orm"
 //		_ "github.com/go-sql-driver/mysql" // import your used driver
 //	)
 //
diff --git a/adapter/plugins/apiauth/apiauth.go b/adapter/plugins/apiauth/apiauth.go
index fd0c7ff4..d5511427 100644
--- a/adapter/plugins/apiauth/apiauth.go
+++ b/adapter/plugins/apiauth/apiauth.go
@@ -17,7 +17,7 @@
 // Simple Usage:
 //	import(
 //		"github.com/beego/beego/v2"
-//		"github.com/beego/beego/v2/plugins/apiauth"
+//		"github.com/beego/beego/v2/server/web/filter/apiauth"
 //	)
 //
 //	func main(){
diff --git a/adapter/plugins/auth/basic.go b/adapter/plugins/auth/basic.go
index 4ef3343f..173252ca 100644
--- a/adapter/plugins/auth/basic.go
+++ b/adapter/plugins/auth/basic.go
@@ -16,7 +16,7 @@
 // Simple Usage:
 //	import(
 //		"github.com/beego/beego/v2"
-//		"github.com/beego/beego/v2/plugins/auth"
+//		"github.com/beego/beego/v2/server/web/filter/auth"
 //	)
 //
 //	func main(){
diff --git a/adapter/plugins/authz/authz.go b/adapter/plugins/authz/authz.go
index 114c8c9a..096d7efb 100644
--- a/adapter/plugins/authz/authz.go
+++ b/adapter/plugins/authz/authz.go
@@ -16,7 +16,7 @@
 // Simple Usage:
 //	import(
 //		"github.com/beego/beego/v2"
-//		"github.com/beego/beego/v2/plugins/authz"
+//		"github.com/beego/beego/v2/server/web/filter/authz"
 //		"github.com/casbin/casbin"
 //	)
 //
diff --git a/adapter/plugins/cors/cors.go b/adapter/plugins/cors/cors.go
index 6a836585..89ac9c68 100644
--- a/adapter/plugins/cors/cors.go
+++ b/adapter/plugins/cors/cors.go
@@ -16,7 +16,7 @@
 // Usage
 //	import (
 // 		"github.com/beego/beego/v2"
-//		"github.com/beego/beego/v2/plugins/cors"
+//		"github.com/beego/beego/v2/server/web/filter/cors"
 // )
 //
 //	func main() {
diff --git a/adapter/session/couchbase/sess_couchbase.go b/adapter/session/couchbase/sess_couchbase.go
index 4ce2d69d..2dc4ce18 100644
--- a/adapter/session/couchbase/sess_couchbase.go
+++ b/adapter/session/couchbase/sess_couchbase.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/couchbase"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/couchbase"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/adapter/session/memcache/sess_memcache.go b/adapter/session/memcache/sess_memcache.go
index e81d06c6..dfbc2d6e 100644
--- a/adapter/session/memcache/sess_memcache.go
+++ b/adapter/session/memcache/sess_memcache.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/memcache"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/memcache"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/adapter/session/mysql/sess_mysql.go b/adapter/session/mysql/sess_mysql.go
index d47e7496..5272d3fa 100644
--- a/adapter/session/mysql/sess_mysql.go
+++ b/adapter/session/mysql/sess_mysql.go
@@ -28,8 +28,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/mysql"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/mysql"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/adapter/session/postgres/sess_postgresql.go b/adapter/session/postgres/sess_postgresql.go
index a24794d6..a6278f17 100644
--- a/adapter/session/postgres/sess_postgresql.go
+++ b/adapter/session/postgres/sess_postgresql.go
@@ -38,8 +38,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/postgresql"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/postgresql"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/adapter/session/redis/sess_redis.go b/adapter/session/redis/sess_redis.go
index a5fcedf6..d38a675d 100644
--- a/adapter/session/redis/sess_redis.go
+++ b/adapter/session/redis/sess_redis.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/redis"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/redis"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 // 	func init() {
diff --git a/adapter/session/redis_cluster/redis_cluster.go b/adapter/session/redis_cluster/redis_cluster.go
index f4c8e4d1..623d72cc 100644
--- a/adapter/session/redis_cluster/redis_cluster.go
+++ b/adapter/session/redis_cluster/redis_cluster.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/redis_cluster"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/redis_cluster"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/adapter/session/redis_sentinel/sess_redis_sentinel.go b/adapter/session/redis_sentinel/sess_redis_sentinel.go
index 4498e55d..4b7dab77 100644
--- a/adapter/session/redis_sentinel/sess_redis_sentinel.go
+++ b/adapter/session/redis_sentinel/sess_redis_sentinel.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/redis_sentinel"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/redis_sentinel"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/adapter/session/session.go b/adapter/session/session.go
index 40e947fd..703adbde 100644
--- a/adapter/session/session.go
+++ b/adapter/session/session.go
@@ -16,7 +16,7 @@
 //
 // Usage:
 // import(
-//   "github.com/beego/beego/v2/session"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/adapter/utils/captcha/README.md b/adapter/utils/captcha/README.md
index 74e1cf82..07a4dc4d 100644
--- a/adapter/utils/captcha/README.md
+++ b/adapter/utils/captcha/README.md
@@ -7,8 +7,8 @@ package controllers
 
 import (
 	"github.com/beego/beego/v2"
-	"github.com/beego/beego/v2/cache"
-	"github.com/beego/beego/v2/utils/captcha"
+	"github.com/beego/beego/v2/client/cache"
+	"github.com/beego/beego/v2/server/web/captcha"
 )
 
 var cpt *captcha.Captcha
diff --git a/adapter/utils/captcha/captcha.go b/adapter/utils/captcha/captcha.go
index 4f5dd867..edca528d 100644
--- a/adapter/utils/captcha/captcha.go
+++ b/adapter/utils/captcha/captcha.go
@@ -20,8 +20,8 @@
 //
 // import (
 // 	"github.com/beego/beego/v2"
-// 	"github.com/beego/beego/v2/cache"
-// 	"github.com/beego/beego/v2/utils/captcha"
+// 	"github.com/beego/beego/v2/client/cache"
+// 	"github.com/beego/beego/v2/server/web/captcha"
 // )
 //
 // var cpt *captcha.Captcha
diff --git a/adapter/utils/pagination/doc.go b/adapter/utils/pagination/doc.go
index d180b093..43ee78b6 100644
--- a/adapter/utils/pagination/doc.go
+++ b/adapter/utils/pagination/doc.go
@@ -8,7 +8,7 @@ In your beego.Controller:
 
  package controllers
 
- import "github.com/beego/beego/v2/utils/pagination"
+ import "github.com/beego/beego/v2/server/web/pagination"
 
  type PostsController struct {
    beego.Controller
diff --git a/adapter/validation/validation.go b/adapter/validation/validation.go
index 8226fa20..eadd4361 100644
--- a/adapter/validation/validation.go
+++ b/adapter/validation/validation.go
@@ -15,7 +15,7 @@
 // Package validation for validations
 //
 //	import (
-//		"github.com/beego/beego/v2/validation"
+//		"github.com/beego/beego/v2/core/validation"
 //		"log"
 //	)
 //
diff --git a/client/cache/README.md b/client/cache/README.md
index 7e65cbbf..df1ea095 100644
--- a/client/cache/README.md
+++ b/client/cache/README.md
@@ -4,7 +4,7 @@ cache is a Go cache manager. It can use many cache adapters. The repo is inspire
 
 ## How to install?
 
-	go get github.com/beego/beego/v2/cache
+	go get github.com/beego/beego/v2/client/cache
 
 ## What adapters are supported?
 
@@ -15,7 +15,7 @@ As of now this cache support memory, Memcache and Redis.
 First you must import it
 
 	import (
-		"github.com/beego/beego/v2/cache"
+		"github.com/beego/beego/v2/client/cache"
 	)
 
 Then init a Cache (example with memory adapter)
diff --git a/client/cache/cache.go b/client/cache/cache.go
index e73a1c1a..70c81697 100644
--- a/client/cache/cache.go
+++ b/client/cache/cache.go
@@ -16,7 +16,7 @@
 // Usage:
 //
 // import(
-//   "github.com/beego/beego/v2/cache"
+//   "github.com/beego/beego/v2/client/cache"
 // )
 //
 // bm, err := cache.NewCache("memory", `{"interval":60}`)
diff --git a/client/cache/calc_utils.go b/client/cache/calc_utils.go
index 91d0974b..733e2fc2 100644
--- a/client/cache/calc_utils.go
+++ b/client/cache/calc_utils.go
@@ -80,4 +80,4 @@ func decr(originVal interface{}) (interface{}, error) {
 	default:
 		return nil, fmt.Errorf("item val is not (u)int (u)int32 (u)int64")
 	}
-}
\ No newline at end of file
+}
diff --git a/client/cache/calc_utils_test.go b/client/cache/calc_utils_test.go
index b98e71de..e81c463b 100644
--- a/client/cache/calc_utils_test.go
+++ b/client/cache/calc_utils_test.go
@@ -19,7 +19,7 @@ func TestIncr(t *testing.T) {
 		t.Errorf("incr failed, expect %v, but %v actually", updateVal, val)
 		return
 	}
-	_, err = incr(int(1 << (strconv.IntSize - 1) - 1))
+	_, err = incr(int(1<<(strconv.IntSize-1) - 1))
 	if err == nil {
 		t.Error("incr failed")
 		return
@@ -73,7 +73,7 @@ func TestIncr(t *testing.T) {
 		t.Errorf("incr failed, expect %v, but %v actually", updateVal, val)
 		return
 	}
-	_, err = incr(uint(1 << (strconv.IntSize) - 1))
+	_, err = incr(uint(1<<(strconv.IntSize) - 1))
 	if err == nil {
 		t.Error("incr failed")
 		return
@@ -238,4 +238,4 @@ func TestDecr(t *testing.T) {
 		t.Error("decr failed")
 		return
 	}
-}
\ No newline at end of file
+}
diff --git a/client/cache/memcache/memcache.go b/client/cache/memcache/memcache.go
index 527d08ca..eed73420 100644
--- a/client/cache/memcache/memcache.go
+++ b/client/cache/memcache/memcache.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/cache/memcache"
-//   "github.com/beego/beego/v2/cache"
+//   _ "github.com/beego/beego/v2/client/cache/memcache"
+//   "github.com/beego/beego/v2/client/cache"
 // )
 //
 //  bm, err := cache.NewCache("memcache", `{"conn":"127.0.0.1:11211"}`)
diff --git a/client/cache/redis/redis.go b/client/cache/redis/redis.go
index dcf0cd5a..180222ae 100644
--- a/client/cache/redis/redis.go
+++ b/client/cache/redis/redis.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/cache/redis"
-//   "github.com/beego/beego/v2/cache"
+//   _ "github.com/beego/beego/v2/client/cache/redis"
+//   "github.com/beego/beego/v2/client/cache"
 // )
 //
 //  bm, err := cache.NewCache("redis", `{"conn":"127.0.0.1:11211"}`)
diff --git a/client/httplib/README.md b/client/httplib/README.md
index 90a6c505..1d22f341 100644
--- a/client/httplib/README.md
+++ b/client/httplib/README.md
@@ -8,7 +8,7 @@ httplib is an libs help you to curl remote url.
 
 you can use Get to crawl data.
 
-	import "github.com/beego/beego/v2/httplib"
+	import "github.com/beego/beego/v2/client/httplib"
 	
 	str, err := httplib.Get("http://beego.me/").String()
 	if err != nil {
@@ -95,4 +95,4 @@ httplib support mutil file upload, use `req.PostFile()`
 
 See godoc for further documentation and examples.
 
-* [godoc.org/github.com/beego/beego/v2/httplib](https://godoc.org/github.com/beego/beego/v2/httplib)
+* [godoc.org/github.com/beego/beego/v2/client/httplib](https://godoc.org/github.com/beego/beego/v2/client/httplib)
diff --git a/client/httplib/error_code.go b/client/httplib/error_code.go
index 961e7e34..bd349a34 100644
--- a/client/httplib/error_code.go
+++ b/client/httplib/error_code.go
@@ -51,7 +51,6 @@ Sometimes you got JSON document and you want to make it as request body. So you
 If you do this, you got this code. Instead, you should call Header to set Content-type and call Body to set body data.
 `)
 
-
 // start with 5 --------------------------------------------------------------------------
 
 var CreateFormFileFailed = berror.DefineCode(5001001, moduleName, "CreateFormFileFailed", `
@@ -125,7 +124,3 @@ Make sure that:
 1. You pass valid structure pointer to the function;
 2. The body is valid YAML document
 `)
-
-
-
-
diff --git a/client/httplib/http_response_test.go b/client/httplib/http_response_test.go
index 90db3fca..a62dd42c 100644
--- a/client/httplib/http_response_test.go
+++ b/client/httplib/http_response_test.go
@@ -20,7 +20,6 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-
 func TestNewHttpResponseWithJsonBody(t *testing.T) {
 	// string
 	resp := NewHttpResponseWithJsonBody("{}")
diff --git a/client/httplib/httplib.go b/client/httplib/httplib.go
index 346de7af..c3c7f6f5 100644
--- a/client/httplib/httplib.go
+++ b/client/httplib/httplib.go
@@ -15,7 +15,7 @@
 // Package httplib is used as http.Client
 // Usage:
 //
-// import "github.com/beego/beego/v2/httplib"
+// import "github.com/beego/beego/v2/client/httplib"
 //
 //	b := httplib.Post("http://beego.me/")
 //	b.Param("username","astaxie")
diff --git a/client/httplib/httplib_test.go b/client/httplib/httplib_test.go
index 36948de7..1fde708a 100644
--- a/client/httplib/httplib_test.go
+++ b/client/httplib/httplib_test.go
@@ -309,7 +309,6 @@ func TestFilterChainOrder(t *testing.T) {
 		}
 	})
 
-
 	req.AddFilters(func(next Filter) Filter {
 		return func(ctx context.Context, req *BeegoHTTPRequest) (*http.Response, error) {
 			return NewHttpResponseWithJsonBody("second"), nil
@@ -396,7 +395,7 @@ func TestBeegoHTTPRequest_Param(t *testing.T) {
 	req.Param(key, value)
 	assert.Equal(t, value, req.params[key][0])
 
-	value1 :=  "test-param-value-1"
+	value1 := "test-param-value-1"
 	req.Param(key, value1)
 	assert.Equal(t, value1, req.params[key][1])
 }
@@ -419,10 +418,10 @@ func TestBeegoHTTPRequest_Body(t *testing.T) {
 	req.Body(13)
 }
 
-
 type user struct {
 	Name string `xml:"name"`
 }
+
 func TestBeegoHTTPRequest_XMLBody(t *testing.T) {
 	req := Post("http://beego.me")
 	body := &user{
@@ -432,4 +431,4 @@ func TestBeegoHTTPRequest_XMLBody(t *testing.T) {
 	assert.True(t, req.req.ContentLength > 0)
 	assert.Nil(t, err)
 	assert.NotNil(t, req.req.GetBody)
-}
\ No newline at end of file
+}
diff --git a/client/httplib/mock/mock.go b/client/httplib/mock/mock.go
index 7640e454..421a7a45 100644
--- a/client/httplib/mock/mock.go
+++ b/client/httplib/mock/mock.go
@@ -44,7 +44,7 @@ func StartMock() Stub {
 	return mockFilter
 }
 
-func CtxWithMock(ctx context.Context, mock... *Mock) context.Context {
+func CtxWithMock(ctx context.Context, mock ...*Mock) context.Context {
 	return context.WithValue(ctx, mockCtxKey, mock)
 }
 
@@ -73,8 +73,6 @@ func NewMock(con RequestCondition, resp *http.Response, err error) *Mock {
 	return &Mock{
 		cond: con,
 		resp: resp,
-		err: err,
+		err:  err,
 	}
 }
-
-
diff --git a/client/httplib/mock/mock_condition.go b/client/httplib/mock/mock_condition.go
index 639b45a3..53d3d703 100644
--- a/client/httplib/mock/mock_condition.go
+++ b/client/httplib/mock/mock_condition.go
@@ -120,7 +120,6 @@ func (sc *SimpleCondition) matchBodyFields(ctx context.Context, req *httplib.Bee
 		return false
 	}
 
-
 	m := make(map[string]interface{})
 
 	err = json.Unmarshal(bytes, &m)
diff --git a/client/httplib/mock/mock_test.go b/client/httplib/mock/mock_test.go
index e73e8a6a..2972cf8f 100644
--- a/client/httplib/mock/mock_test.go
+++ b/client/httplib/mock/mock_test.go
@@ -72,6 +72,6 @@ func OriginnalCodeUsingHttplibPassCtx(ctx context.Context) (*http.Response, erro
 	return httplib.Get("http://localhost:7777/abc").DoRequestWithCtx(ctx)
 }
 
-func OriginalCodeUsingHttplib() (*http.Response, error){
+func OriginalCodeUsingHttplib() (*http.Response, error) {
 	return httplib.Get("http://localhost:7777/abc").DoRequest()
 }
diff --git a/client/httplib/setting.go b/client/httplib/setting.go
index c8d049e0..d25fc4a9 100644
--- a/client/httplib/setting.go
+++ b/client/httplib/setting.go
@@ -78,4 +78,4 @@ func AddDefaultFilter(fc FilterChain) {
 		defaultSetting.FilterChains = make([]FilterChain, 0, 4)
 	}
 	defaultSetting.FilterChains = append(defaultSetting.FilterChains, fc)
-}
\ No newline at end of file
+}
diff --git a/client/orm/README.md b/client/orm/README.md
index 58669e1f..bb11d1c6 100644
--- a/client/orm/README.md
+++ b/client/orm/README.md
@@ -27,7 +27,7 @@ more features please read the docs
 
 **Install:**
 
-	go get github.com/beego/beego/v2/orm
+	go get github.com/beego/beego/v2/client/orm
 
 ## Changelog
 
@@ -45,7 +45,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/beego/beego/v2/orm"
+	"github.com/beego/beego/v2/client/orm"
 	_ "github.com/go-sql-driver/mysql" // import your used driver
 )
 
diff --git a/client/orm/clauses/const.go b/client/orm/clauses/const.go
index 747d3fd7..38a6d556 100644
--- a/client/orm/clauses/const.go
+++ b/client/orm/clauses/const.go
@@ -1,6 +1,6 @@
 package clauses
 
 const (
-	ExprSep                = "__"
-	ExprDot                = "."
+	ExprSep = "__"
+	ExprDot = "."
 )
diff --git a/client/orm/clauses/order_clause/order.go b/client/orm/clauses/order_clause/order.go
index e45c2f85..bdb2d1ca 100644
--- a/client/orm/clauses/order_clause/order.go
+++ b/client/orm/clauses/order_clause/order.go
@@ -1,8 +1,9 @@
 package order_clause
 
 import (
-	"github.com/beego/beego/v2/client/orm/clauses"
 	"strings"
+
+	"github.com/beego/beego/v2/client/orm/clauses"
 )
 
 type Sort int8
diff --git a/client/orm/db_tables.go b/client/orm/db_tables.go
index d62d8106..f81651ff 100644
--- a/client/orm/db_tables.go
+++ b/client/orm/db_tables.go
@@ -16,10 +16,11 @@ package orm
 
 import (
 	"fmt"
-	"github.com/beego/beego/v2/client/orm/clauses"
-	"github.com/beego/beego/v2/client/orm/clauses/order_clause"
 	"strings"
 	"time"
+
+	"github.com/beego/beego/v2/client/orm/clauses"
+	"github.com/beego/beego/v2/client/orm/clauses/order_clause"
 )
 
 // table info struct.
diff --git a/client/orm/mock/condition.go b/client/orm/mock/condition.go
index 486849d4..eda88824 100644
--- a/client/orm/mock/condition.go
+++ b/client/orm/mock/condition.go
@@ -23,14 +23,14 @@ import (
 type Mock struct {
 	cond Condition
 	resp []interface{}
-	cb func(inv *orm.Invocation)
+	cb   func(inv *orm.Invocation)
 }
 
 func NewMock(cond Condition, resp []interface{}, cb func(inv *orm.Invocation)) *Mock {
 	return &Mock{
 		cond: cond,
 		resp: resp,
-		cb: cb,
+		cb:   cb,
 	}
 }
 
diff --git a/client/orm/mock/mock_orm_test.go b/client/orm/mock/mock_orm_test.go
index d65855cb..1b321f01 100644
--- a/client/orm/mock/mock_orm_test.go
+++ b/client/orm/mock/mock_orm_test.go
@@ -24,7 +24,9 @@ import (
 
 	"github.com/beego/beego/v2/client/orm"
 )
+
 const mockErrorMsg = "mock error"
+
 func init() {
 	orm.RegisterModel(&User{})
 }
@@ -239,7 +241,7 @@ func TestTransactionRollback(t *testing.T) {
 	assert.Equal(t, mock, err)
 }
 
-func TestTransactionCommit(t *testing.T)  {
+func TestTransactionCommit(t *testing.T) {
 	s := StartMock()
 	defer s.Clear()
 	mock := errors.New(mockErrorMsg)
diff --git a/client/orm/mock/mock_queryM2Mer.go b/client/orm/mock/mock_queryM2Mer.go
index 16648fee..a58f10ae 100644
--- a/client/orm/mock/mock_queryM2Mer.go
+++ b/client/orm/mock/mock_queryM2Mer.go
@@ -23,7 +23,6 @@ import (
 // DoNothingQueryM2Mer do nothing
 // use it to build mock orm.QueryM2Mer
 type DoNothingQueryM2Mer struct {
-	
 }
 
 func (d *DoNothingQueryM2Mer) AddWithCtx(ctx context.Context, i ...interface{}) (int64, error) {
@@ -68,13 +67,13 @@ func (d *DoNothingQueryM2Mer) Count() (int64, error) {
 
 type QueryM2MerCondition struct {
 	tableName string
-	name string
+	name      string
 }
 
 func NewQueryM2MerCondition(tableName string, name string) *QueryM2MerCondition {
 	return &QueryM2MerCondition{
 		tableName: tableName,
-		name: name,
+		name:      name,
 	}
 }
 
@@ -88,5 +87,3 @@ func (q *QueryM2MerCondition) Match(ctx context.Context, inv *orm.Invocation) bo
 	}
 	return res
 }
-
-
diff --git a/client/orm/mock/mock_queryM2Mer_test.go b/client/orm/mock/mock_queryM2Mer_test.go
index 82776e76..ef754092 100644
--- a/client/orm/mock/mock_queryM2Mer_test.go
+++ b/client/orm/mock/mock_queryM2Mer_test.go
@@ -60,4 +60,4 @@ func TestNewQueryM2MerCondition(t *testing.T) {
 	assert.True(t, cond.Match(context.Background(), &orm.Invocation{
 		Args: []interface{}{0, "A"},
 	}))
-}
\ No newline at end of file
+}
diff --git a/client/orm/mock/mock_rawSetter.go b/client/orm/mock/mock_rawSetter.go
index 016fde47..00311e80 100644
--- a/client/orm/mock/mock_rawSetter.go
+++ b/client/orm/mock/mock_rawSetter.go
@@ -61,4 +61,4 @@ func (d *DoNothingRawSetter) RowsToStruct(ptrStruct interface{}, keyCol, valueCo
 
 func (d *DoNothingRawSetter) Prepare() (orm.RawPreparer, error) {
 	return nil, nil
-}
\ No newline at end of file
+}
diff --git a/client/orm/models.go b/client/orm/models.go
index 0f07e24d..31cdc4a1 100644
--- a/client/orm/models.go
+++ b/client/orm/models.go
@@ -369,7 +369,7 @@ func (mc *_modelCache) register(prefixOrSuffixStr string, prefixOrSuffix bool, m
 		}
 
 		if _, ok := mc.get(table); ok {
-			return	nil
+			return nil
 		}
 
 		mi := newModelInfo(val)
diff --git a/client/orm/orm.go b/client/orm/orm.go
index 660f2939..3f342868 100644
--- a/client/orm/orm.go
+++ b/client/orm/orm.go
@@ -58,11 +58,12 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm/clauses/order_clause"
 	"os"
 	"reflect"
 	"time"
 
+	"github.com/beego/beego/v2/client/orm/clauses/order_clause"
+
 	"github.com/beego/beego/v2/client/orm/hints"
 	"github.com/beego/beego/v2/core/utils"
 
diff --git a/client/orm/orm_conds.go b/client/orm/orm_conds.go
index 0080d53c..eeb5538a 100644
--- a/client/orm/orm_conds.go
+++ b/client/orm/orm_conds.go
@@ -16,8 +16,9 @@ package orm
 
 import (
 	"fmt"
-	"github.com/beego/beego/v2/client/orm/clauses"
 	"strings"
+
+	"github.com/beego/beego/v2/client/orm/clauses"
 )
 
 // ExprSep define the expression separation
diff --git a/client/orm/orm_test.go b/client/orm/orm_test.go
index e2e25ac4..c9920f48 100644
--- a/client/orm/orm_test.go
+++ b/client/orm/orm_test.go
@@ -21,7 +21,6 @@ import (
 	"context"
 	"database/sql"
 	"fmt"
-	"github.com/beego/beego/v2/client/orm/clauses/order_clause"
 	"io/ioutil"
 	"math"
 	"os"
@@ -32,6 +31,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/beego/beego/v2/client/orm/clauses/order_clause"
+
 	"github.com/beego/beego/v2/client/orm/hints"
 
 	"github.com/stretchr/testify/assert"
diff --git a/core/berror/codes.go b/core/berror/codes.go
index e3a616e8..b6712a84 100644
--- a/core/berror/codes.go
+++ b/core/berror/codes.go
@@ -19,8 +19,6 @@ import (
 	"sync"
 )
 
-
-
 // A Code is an unsigned 32-bit error code as defined in the beego spec.
 type Code interface {
 	Code() uint32
@@ -38,9 +36,9 @@ var defaultCodeRegistry = &codeRegistry{
 // desc could be markdown doc
 func DefineCode(code uint32, module string, name string, desc string) Code {
 	res := &codeDefinition{
-		code: code,
+		code:   code,
 		module: module,
-		desc: desc,
+		desc:   desc,
 	}
 	defaultCodeRegistry.lock.Lock()
 	defer defaultCodeRegistry.lock.Unlock()
@@ -53,11 +51,10 @@ func DefineCode(code uint32, module string, name string, desc string) Code {
 }
 
 type codeRegistry struct {
-	lock sync.RWMutex
+	lock  sync.RWMutex
 	codes map[uint32]*codeDefinition
 }
 
-
 func (cr *codeRegistry) Get(code uint32) (Code, bool) {
 	cr.lock.RLock()
 	defer cr.lock.RUnlock()
@@ -66,13 +63,12 @@ func (cr *codeRegistry) Get(code uint32) (Code, bool) {
 }
 
 type codeDefinition struct {
-	code uint32
+	code   uint32
 	module string
-	desc string
-	name string
+	desc   string
+	name   string
 }
 
-
 func (c *codeDefinition) Name() string {
 	return c.name
 }
@@ -88,4 +84,3 @@ func (c *codeDefinition) Module() string {
 func (c *codeDefinition) Desc() string {
 	return c.desc
 }
-
diff --git a/core/berror/pre_define_code.go b/core/berror/pre_define_code.go
index 01992957..275f86c1 100644
--- a/core/berror/pre_define_code.go
+++ b/core/berror/pre_define_code.go
@@ -21,7 +21,7 @@ import (
 // pre define code
 
 // Unknown indicates got some error which is not defined
-var Unknown = DefineCode(5000001, "error", "Unknown",fmt.Sprintf(`
+var Unknown = DefineCode(5000001, "error", "Unknown", fmt.Sprintf(`
 Unknown error code. Usually you will see this code in three cases:
 1. You forget to define Code or function DefineCode not being executed;
 2. This is not Beego's error but you call FromError();
@@ -49,4 +49,3 @@ func goCodeBlock(code string) string {
 func codeBlock(lan string, code string) string {
 	return fmt.Sprintf("```%s\n%s\n```", lan, code)
 }
-
diff --git a/core/config/config.go b/core/config/config.go
index d0add317..98080fe3 100644
--- a/core/config/config.go
+++ b/core/config/config.go
@@ -14,7 +14,7 @@
 
 // Package config is used to parse config.
 // Usage:
-//  import "github.com/beego/beego/v2/config"
+//  import "github.com/beego/beego/v2/core/config"
 // Examples.
 //
 //  cnf, err := config.NewConfig("ini", "config.conf")
diff --git a/core/config/xml/xml.go b/core/config/xml/xml.go
index 059ada5c..56bbd428 100644
--- a/core/config/xml/xml.go
+++ b/core/config/xml/xml.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 //  import(
-//    _ "github.com/beego/beego/v2/config/xml"
-//      "github.com/beego/beego/v2/config"
+//    _ "github.com/beego/beego/v2/core/config/xml"
+//      "github.com/beego/beego/v2/core/config"
 //  )
 //
 //  cnf, err := config.NewConfig("xml", "config.xml")
diff --git a/core/config/yaml/yaml.go b/core/config/yaml/yaml.go
index 778a4eb1..10335123 100644
--- a/core/config/yaml/yaml.go
+++ b/core/config/yaml/yaml.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 //  import(
-//   _ "github.com/beego/beego/v2/config/yaml"
-//     "github.com/beego/beego/v2/config"
+//   _ "github.com/beego/beego/v2/core/config/yaml"
+//     "github.com/beego/beego/v2/core/config"
 //  )
 //
 //  cnf, err := config.NewConfig("yaml", "config.yaml")
diff --git a/core/logs/README.md b/core/logs/README.md
index c7c82110..b2c405ff 100644
--- a/core/logs/README.md
+++ b/core/logs/README.md
@@ -4,7 +4,7 @@ logs is a Go logs manager. It can use many logs adapters. The repo is inspired b
 
 ## How to install?
 
-	go get github.com/beego/beego/v2/logs
+	go get github.com/beego/beego/v2/core/logs
 
 ## What adapters are supported?
 
@@ -16,7 +16,7 @@ First you must import it
 
 ```golang
 import (
-	"github.com/beego/beego/v2/logs"
+	"github.com/beego/beego/v2/core/logs"
 )
 ```
 
diff --git a/core/logs/es/es.go b/core/logs/es/es.go
index 2e592ffd..1140da97 100644
--- a/core/logs/es/es.go
+++ b/core/logs/es/es.go
@@ -29,7 +29,7 @@ func NewES() logs.Logger {
 // please import this package
 // usually means that you can import this package in your main package
 // for example, anonymous:
-// import _ "github.com/beego/beego/v2/logs/es"
+// import _ "github.com/beego/beego/v2/core/logs/es"
 type esLogger struct {
 	*elasticsearch.Client
 	DSN       string `json:"dsn"`
diff --git a/core/logs/log.go b/core/logs/log.go
index ef9aa7f3..fed73d98 100644
--- a/core/logs/log.go
+++ b/core/logs/log.go
@@ -15,7 +15,7 @@
 // Package logs provide a general log interface
 // Usage:
 //
-// import "github.com/beego/beego/v2/logs"
+// import "github.com/beego/beego/v2/core/logs"
 //
 //	log := NewLogger(10000)
 //	log.SetLogger("console", "")
diff --git a/core/validation/README.md b/core/validation/README.md
index 46d7c935..dee5a7b1 100644
--- a/core/validation/README.md
+++ b/core/validation/README.md
@@ -7,18 +7,18 @@ validation is a form validation for a data validation and error collecting using
 
 Install:
 
-	go get github.com/beego/beego/v2/validation
+	go get github.com/beego/beego/v2/core/validation
 
 Test:
 
-	go test github.com/beego/beego/v2/validation
+	go test github.com/beego/beego/v2/core/validation
 
 ## Example
 
 Direct Use:
 
 	import (
-		"github.com/beego/beego/v2/validation"
+		"github.com/beego/beego/v2/core/validation"
 		"log"
 	)
 
@@ -49,7 +49,7 @@ Direct Use:
 Struct Tag Use:
 
 	import (
-		"github.com/beego/beego/v2/validation"
+		"github.com/beego/beego/v2/core/validation"
 	)
 
 	// validation function follow with "valid" tag
@@ -81,7 +81,7 @@ Struct Tag Use:
 Use custom function:
 
 	import (
-		"github.com/beego/beego/v2/validation"
+		"github.com/beego/beego/v2/core/validation"
 	)
 
 	type user struct {
diff --git a/core/validation/validation.go b/core/validation/validation.go
index eb3a1042..cd9f1eb4 100644
--- a/core/validation/validation.go
+++ b/core/validation/validation.go
@@ -15,7 +15,7 @@
 // Package validation for validations
 //
 //	import (
-//		"github.com/beego/beego/v2/validation"
+//		"github.com/beego/beego/v2/core/validation"
 //		"log"
 //	)
 //
diff --git a/go.mod b/go.mod
index ce67b7d2..a76b17f3 100644
--- a/go.mod
+++ b/go.mod
@@ -12,8 +12,8 @@ require (
 	github.com/coreos/go-semver v0.3.0 // indirect
 	github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf // indirect
 	github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
-	github.com/couchbase/go-couchbase v0.0.0-20201216133707-c04035124b17
-	github.com/couchbase/gomemcached v0.1.2-0.20201215185628-3bc3f73e68cb // indirect
+	github.com/couchbase/go-couchbase v0.0.0-20210126152612-8e416c37c8ef
+	github.com/couchbase/gomemcached v0.1.2-0.20210126151728-840240974836 // indirect
 	github.com/couchbase/goutils v0.0.0-20201030094643-5e82bb967e67 // indirect
 	github.com/elastic/go-elasticsearch/v6 v6.8.5
 	github.com/elazarl/go-bindata-assetfs v1.0.0
diff --git a/go.sum b/go.sum
index 17ecab27..1c5328c0 100644
--- a/go.sum
+++ b/go.sum
@@ -42,6 +42,8 @@ github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d h1:OMrhQqj1
 github.com/couchbase/go-couchbase v0.0.0-20200519150804-63f3cdb75e0d/go.mod h1:TWI8EKQMs5u5jLKW/tsb9VwauIrMIxQG1r5fMsswK5U=
 github.com/couchbase/go-couchbase v0.0.0-20201216133707-c04035124b17 h1:1ZELwRDUvpBpmgKSIUP6VMW1jIehzD0sCdWxRyejegw=
 github.com/couchbase/go-couchbase v0.0.0-20201216133707-c04035124b17/go.mod h1:+/bddYDxXsf9qt0xpDUtRR47A2GjaXmGGAqQ/k3GJ8A=
+github.com/couchbase/go-couchbase v0.0.0-20210126152612-8e416c37c8ef h1:pXh08kdOlR7eZbHWd7Zvz2KZbI2sxbHRxM+UTWj6oQ0=
+github.com/couchbase/go-couchbase v0.0.0-20210126152612-8e416c37c8ef/go.mod h1:+/bddYDxXsf9qt0xpDUtRR47A2GjaXmGGAqQ/k3GJ8A=
 github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808 h1:8s2l8TVUwMXl6tZMe3+hPCRJ25nQXiA3d1x622JtOqc=
 github.com/couchbase/gomemcached v0.0.0-20200526233749-ec430f949808/go.mod h1:srVSlQLB8iXBVXHgnqemxUXqN6FCvClgCMPCsjBDR7c=
 github.com/couchbase/gomemcached v0.1.0 h1:whUde87n8CScx8ckMp2En5liqAlcuG3aKy/BQeBPu84=
@@ -50,6 +52,8 @@ github.com/couchbase/gomemcached v0.1.1 h1:xCS8ZglJDhrlQg3jmK7Rn1V8f7bPjXABLC05C
 github.com/couchbase/gomemcached v0.1.1/go.mod h1:mxliKQxOv84gQ0bJWbI+w9Wxdpt9HjDvgW9MjCym5Vo=
 github.com/couchbase/gomemcached v0.1.2-0.20201215185628-3bc3f73e68cb h1:ZCFku0K/3Xvl7rXkGGM+ioT76Rxko8V9wDEWa0GFp14=
 github.com/couchbase/gomemcached v0.1.2-0.20201215185628-3bc3f73e68cb/go.mod h1:mxliKQxOv84gQ0bJWbI+w9Wxdpt9HjDvgW9MjCym5Vo=
+github.com/couchbase/gomemcached v0.1.2-0.20210126151728-840240974836 h1:ZxgtUfduO/Fk2NY1e1YhlgN6tRl0TMdXK9ElddO7uZY=
+github.com/couchbase/gomemcached v0.1.2-0.20210126151728-840240974836/go.mod h1:mxliKQxOv84gQ0bJWbI+w9Wxdpt9HjDvgW9MjCym5Vo=
 github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a h1:Y5XsLCEhtEI8qbD9RP3Qlv5FXdTDHxZM9UPUnMRgBp8=
 github.com/couchbase/goutils v0.0.0-20180530154633-e865a1461c8a/go.mod h1:BQwMFlJzDjFDG3DJUdU0KORxn88UlsOULuxLExMh3Hs=
 github.com/couchbase/goutils v0.0.0-20201030094643-5e82bb967e67 h1:NCqJ6fwen6YP0WlV/IyibaT0kPt3JEI1rA62V/UPKT4=
diff --git a/server/web/captcha/README.md b/server/web/captcha/README.md
index 74e1cf82..07a4dc4d 100644
--- a/server/web/captcha/README.md
+++ b/server/web/captcha/README.md
@@ -7,8 +7,8 @@ package controllers
 
 import (
 	"github.com/beego/beego/v2"
-	"github.com/beego/beego/v2/cache"
-	"github.com/beego/beego/v2/utils/captcha"
+	"github.com/beego/beego/v2/client/cache"
+	"github.com/beego/beego/v2/server/web/captcha"
 )
 
 var cpt *captcha.Captcha
diff --git a/server/web/captcha/captcha.go b/server/web/captcha/captcha.go
index d052af13..e0a9a6ed 100644
--- a/server/web/captcha/captcha.go
+++ b/server/web/captcha/captcha.go
@@ -20,8 +20,8 @@
 //
 // import (
 // 	"github.com/beego/beego/v2"
-// 	"github.com/beego/beego/v2/cache"
-// 	"github.com/beego/beego/v2/utils/captcha"
+// 	"github.com/beego/beego/v2/client/cache"
+// 	"github.com/beego/beego/v2/server/web/captcha"
 // )
 //
 // var cpt *captcha.Captcha
diff --git a/server/web/context/context.go b/server/web/context/context.go
index 099729d0..bf6da3d2 100644
--- a/server/web/context/context.go
+++ b/server/web/context/context.go
@@ -15,7 +15,7 @@
 // Package context provide the context utils
 // Usage:
 //
-//	import "github.com/beego/beego/v2/context"
+//	import "github.com/beego/beego/v2/server/web/context"
 //
 //	ctx := context.Context{Request:req,ResponseWriter:rw}
 //
@@ -29,13 +29,14 @@ import (
 	"encoding/base64"
 	"errors"
 	"fmt"
-	"github.com/beego/beego/v2/server/web/session"
 	"net"
 	"net/http"
 	"strconv"
 	"strings"
 	"time"
 
+	"github.com/beego/beego/v2/server/web/session"
+
 	"github.com/beego/beego/v2/core/utils"
 )
 
diff --git a/server/web/context/context_test.go b/server/web/context/context_test.go
index 977c3cbf..3915a853 100644
--- a/server/web/context/context_test.go
+++ b/server/web/context/context_test.go
@@ -15,10 +15,11 @@
 package context
 
 import (
-	"github.com/beego/beego/v2/server/web/session"
 	"net/http"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/beego/beego/v2/server/web/session"
 )
 
 func TestXsrfReset_01(t *testing.T) {
@@ -68,4 +69,4 @@ func TestContext_Session2(t *testing.T) {
 	if store, err := c.Session(); store == nil || err != nil {
 		t.FailNow()
 	}
-}
\ No newline at end of file
+}
diff --git a/server/web/filter/apiauth/apiauth.go b/server/web/filter/apiauth/apiauth.go
index 9e6c30dc..ee92bd01 100644
--- a/server/web/filter/apiauth/apiauth.go
+++ b/server/web/filter/apiauth/apiauth.go
@@ -17,7 +17,7 @@
 // Simple Usage:
 //	import(
 //		"github.com/beego/beego/v2"
-//		"github.com/beego/beego/v2/plugins/apiauth"
+//		"github.com/beego/beego/v2/server/web/filter/apiauth"
 //	)
 //
 //	func main(){
diff --git a/server/web/filter/auth/basic.go b/server/web/filter/auth/basic.go
index 5a01f260..403d4b2c 100644
--- a/server/web/filter/auth/basic.go
+++ b/server/web/filter/auth/basic.go
@@ -16,7 +16,7 @@
 // Simple Usage:
 //	import(
 //		"github.com/beego/beego/v2"
-//		"github.com/beego/beego/v2/plugins/auth"
+//		"github.com/beego/beego/v2/server/web/filter/auth"
 //	)
 //
 //	func main(){
diff --git a/server/web/filter/authz/authz.go b/server/web/filter/authz/authz.go
index 8009c976..4ff2d6bf 100644
--- a/server/web/filter/authz/authz.go
+++ b/server/web/filter/authz/authz.go
@@ -16,7 +16,7 @@
 // Simple Usage:
 //	import(
 //		"github.com/beego/beego/v2"
-//		"github.com/beego/beego/v2/plugins/authz"
+//		"github.com/beego/beego/v2/server/web/filter/authz"
 //		"github.com/casbin/casbin"
 //	)
 //
diff --git a/server/web/filter/cors/cors.go b/server/web/filter/cors/cors.go
index 0eb9aa30..c5d28819 100644
--- a/server/web/filter/cors/cors.go
+++ b/server/web/filter/cors/cors.go
@@ -16,7 +16,7 @@
 // Usage
 //	import (
 // 		"github.com/beego/beego/v2"
-//		"github.com/beego/beego/v2/plugins/cors"
+//		"github.com/beego/beego/v2/server/web/filter/cors"
 // )
 //
 //	func main() {
diff --git a/server/web/filter/prometheus/filter_test.go b/server/web/filter/prometheus/filter_test.go
index 7d88d843..618ce5af 100644
--- a/server/web/filter/prometheus/filter_test.go
+++ b/server/web/filter/prometheus/filter_test.go
@@ -53,4 +53,4 @@ func TestFilterChainBuilder_report(t *testing.T) {
 
 	ctx.Input.SetData("RouterPattern", "my-route")
 	report(time.Second, ctx, fb.buildVec())
-}
\ No newline at end of file
+}
diff --git a/server/web/filter/session/filter.go b/server/web/filter/session/filter.go
index bcf9edf4..b26e4d53 100644
--- a/server/web/filter/session/filter.go
+++ b/server/web/filter/session/filter.go
@@ -2,6 +2,7 @@ package session
 
 import (
 	"context"
+
 	"github.com/beego/beego/v2/core/logs"
 	"github.com/beego/beego/v2/server/web"
 	webContext "github.com/beego/beego/v2/server/web/context"
@@ -32,4 +33,4 @@ func Session(providerType session.ProviderType, options ...session.ManagerConfig
 			next(ctx)
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/server/web/filter/session/filter_test.go b/server/web/filter/session/filter_test.go
index 687789a5..43046bf3 100644
--- a/server/web/filter/session/filter_test.go
+++ b/server/web/filter/session/filter_test.go
@@ -1,13 +1,14 @@
 package session
 
 import (
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
 	"github.com/beego/beego/v2/server/web"
 	webContext "github.com/beego/beego/v2/server/web/context"
 	"github.com/beego/beego/v2/server/web/session"
 	"github.com/google/uuid"
-	"net/http"
-	"net/http/httptest"
-	"testing"
 )
 
 func testRequest(t *testing.T, handler *web.ControllerRegister, path string, method string, code int) {
diff --git a/server/web/filter_chain_test.go b/server/web/filter_chain_test.go
index 5dd38fc5..d76d8cbf 100644
--- a/server/web/filter_chain_test.go
+++ b/server/web/filter_chain_test.go
@@ -60,7 +60,6 @@ func TestControllerRegister_InsertFilterChain_Order(t *testing.T) {
 		}
 	})
 
-
 	InsertFilterChain("/abc", func(next FilterFunc) FilterFunc {
 		return func(ctx *context.Context) {
 			ctx.Output.Header("second", fmt.Sprintf("%d", time.Now().UnixNano()))
diff --git a/server/web/grace/grace.go b/server/web/grace/grace.go
index 0adc8654..96ae10ef 100644
--- a/server/web/grace/grace.go
+++ b/server/web/grace/grace.go
@@ -22,7 +22,7 @@
 //	 "net/http"
 //	 "os"
 //
-//   "github.com/beego/beego/v2/grace"
+//   "github.com/beego/beego/v2/server/web/grace"
 // )
 //
 //  func handler(w http.ResponseWriter, r *http.Request) {
diff --git a/server/web/parser.go b/server/web/parser.go
index 6d87207c..b3a8b42b 100644
--- a/server/web/parser.go
+++ b/server/web/parser.go
@@ -70,7 +70,7 @@ var (
 	}
 )
 
-const commentFilename   = "commentsRouter.go"
+const commentFilename = "commentsRouter.go"
 
 func init() {
 	pkgLastupdate = make(map[string]int64)
diff --git a/server/web/parser_test.go b/server/web/parser_test.go
index 1f34d8d8..1dead882 100644
--- a/server/web/parser_test.go
+++ b/server/web/parser_test.go
@@ -22,7 +22,7 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func Test_getRouterDir(t *testing.T)  {
+func Test_getRouterDir(t *testing.T) {
 	pkg := filepath.Dir(os.TempDir())
 
 	res := getRouterDir(pkg)
diff --git a/server/web/session/README.md b/server/web/session/README.md
index 854fb590..8dd70f67 100644
--- a/server/web/session/README.md
+++ b/server/web/session/README.md
@@ -6,7 +6,7 @@ and `database/sql/driver`.
 
 ## How to install?
 
-	go get github.com/beego/beego/v2/session
+	go get github.com/beego/beego/v2/server/web/session
 
 ## What providers are supported?
 
@@ -17,7 +17,7 @@ As of now this session manager support memory, file, Redis and MySQL.
 First you must import it
 
 	import (
-		"github.com/beego/beego/v2/session"
+		"github.com/beego/beego/v2/server/web/session"
 	)
 
 Then in you web app init the global session manager
diff --git a/server/web/session/couchbase/sess_couchbase.go b/server/web/session/couchbase/sess_couchbase.go
index ea94f501..b9075040 100644
--- a/server/web/session/couchbase/sess_couchbase.go
+++ b/server/web/session/couchbase/sess_couchbase.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/couchbase"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/couchbase"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/server/web/session/memcache/sess_memcache.go b/server/web/session/memcache/sess_memcache.go
index 3f4c9842..cf191fdf 100644
--- a/server/web/session/memcache/sess_memcache.go
+++ b/server/web/session/memcache/sess_memcache.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/memcache"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/memcache"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/server/web/session/mysql/sess_mysql.go b/server/web/session/mysql/sess_mysql.go
index d76ec287..a3409d4f 100644
--- a/server/web/session/mysql/sess_mysql.go
+++ b/server/web/session/mysql/sess_mysql.go
@@ -28,8 +28,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/mysql"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/mysql"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/server/web/session/postgres/sess_postgresql.go b/server/web/session/postgres/sess_postgresql.go
index 7745ff5f..b26b82ce 100644
--- a/server/web/session/postgres/sess_postgresql.go
+++ b/server/web/session/postgres/sess_postgresql.go
@@ -38,8 +38,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/postgresql"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/postgresql"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/server/web/session/redis/sess_redis.go b/server/web/session/redis/sess_redis.go
index e3d38be3..acc25f78 100644
--- a/server/web/session/redis/sess_redis.go
+++ b/server/web/session/redis/sess_redis.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/redis"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/redis"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 // 	func init() {
diff --git a/server/web/session/redis_cluster/redis_cluster.go b/server/web/session/redis_cluster/redis_cluster.go
index e94dccc3..4db3bbe9 100644
--- a/server/web/session/redis_cluster/redis_cluster.go
+++ b/server/web/session/redis_cluster/redis_cluster.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/redis_cluster"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/redis_cluster"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/server/web/session/redis_sentinel/sess_redis_sentinel.go b/server/web/session/redis_sentinel/sess_redis_sentinel.go
index 2d64c6b4..d18a3773 100644
--- a/server/web/session/redis_sentinel/sess_redis_sentinel.go
+++ b/server/web/session/redis_sentinel/sess_redis_sentinel.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 // import(
-//   _ "github.com/beego/beego/v2/session/redis_sentinel"
-//   "github.com/beego/beego/v2/session"
+//   _ "github.com/beego/beego/v2/server/web/session/redis_sentinel"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
diff --git a/server/web/session/session.go b/server/web/session/session.go
index ca0407e8..f0b7e292 100644
--- a/server/web/session/session.go
+++ b/server/web/session/session.go
@@ -16,7 +16,7 @@
 //
 // Usage:
 // import(
-//   "github.com/beego/beego/v2/session"
+//   "github.com/beego/beego/v2/server/web/session"
 // )
 //
 //	func init() {
@@ -221,7 +221,7 @@ func (manager *Manager) SessionStart(w http.ResponseWriter, r *http.Request) (se
 		HttpOnly: !manager.config.DisableHTTPOnly,
 		Secure:   manager.isSecure(r),
 		Domain:   manager.config.Domain,
-		SameSite:   manager.config.CookieSameSite,
+		SameSite: manager.config.CookieSameSite,
 	}
 	if manager.config.CookieLifeTime > 0 {
 		cookie.MaxAge = manager.config.CookieLifeTime
diff --git a/server/web/session/session_config_test.go b/server/web/session/session_config_test.go
index a596c5c6..0ea7d22b 100644
--- a/server/web/session/session_config_test.go
+++ b/server/web/session/session_config_test.go
@@ -219,4 +219,4 @@ func TestManagerConfig_Opts(t *testing.T) {
 	if c.EnableSetCookie != true {
 		t.Error()
 	}
-}
\ No newline at end of file
+}
diff --git a/server/web/tree.go b/server/web/tree.go
index 5a765fd3..79f3da7a 100644
--- a/server/web/tree.go
+++ b/server/web/tree.go
@@ -342,8 +342,9 @@ func (t *Tree) match(treePattern string, pattern string, wildcardValues []string
 	if runObject == nil && len(t.fixrouters) > 0 {
 		// Filter the .json .xml .html extension
 		for _, str := range allowSuffixExt {
-			if strings.HasSuffix(seg, str) {
+			if strings.HasSuffix(seg, str) && strings.HasSuffix(treePattern, seg) {
 				for _, subTree := range t.fixrouters {
+					// strings.HasSuffix(treePattern, seg) avoid cases: /aaa.html/bbb could access /aaa/bbb
 					if subTree.prefix == seg[:len(seg)-len(str)] {
 						runObject = subTree.match(treePattern, pattern, wildcardValues, ctx)
 						if runObject != nil {
diff --git a/server/web/tree_test.go b/server/web/tree_test.go
index 43511ad8..0885ffe8 100644
--- a/server/web/tree_test.go
+++ b/server/web/tree_test.go
@@ -17,6 +17,7 @@ package web
 import (
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/beego/beego/v2/server/web/context"
 )
@@ -49,7 +50,7 @@ func notMatchTestInfo(pattern, url string) testInfo {
 }
 
 func init() {
-	routers = make([]testInfo, 0)
+	routers = make([]testInfo, 0, 128)
 	// match example
 	routers = append(routers, matchTestInfo("/topic/?:auth:int", "/topic", nil))
 	routers = append(routers, matchTestInfo("/topic/?:auth:int", "/topic/123", map[string]string{":auth": "123"}))
@@ -108,12 +109,23 @@ func init() {
 	routers = append(routers, notMatchTestInfo("/read_:id:int\\.htm", "/read_222_htm"))
 	routers = append(routers, notMatchTestInfo("/read_:id:int\\.htm", " /read_262shtm"))
 
+	// test .html, .json not suffix
+	const abcHtml = "/suffix/abc.html"
+	routers = append(routers, notMatchTestInfo(abcHtml, "/suffix.html/abc"))
+	routers = append(routers, matchTestInfo("/suffix/abc", abcHtml, nil))
+	routers = append(routers, matchTestInfo("/suffix/*", abcHtml, nil))
+	routers = append(routers, notMatchTestInfo("/suffix/*", "/suffix.html/a"))
+	const abcSuffix = "/abc/suffix/*"
+	routers = append(routers, notMatchTestInfo(abcSuffix, "/abc/suffix.html/a"))
+	routers = append(routers, matchTestInfo(abcSuffix, "/abc/suffix/a", nil))
+	routers = append(routers, notMatchTestInfo(abcSuffix, "/abc.j/suffix/a"))
+
 }
 
 func TestTreeRouters(t *testing.T) {
 	for _, r := range routers {
-		shouldMatch := r.shouldMatchOrNot
 
+		shouldMatch := r.shouldMatchOrNot
 		tr := NewTree()
 		tr.AddRouter(r.pattern, "astaxie")
 		ctx := context.NewContext()
@@ -122,7 +134,7 @@ func TestTreeRouters(t *testing.T) {
 			if obj != nil {
 				t.Fatal("pattern:", r.pattern, ", should not match", r.requestUrl)
 			} else {
-				return
+				continue
 			}
 		}
 		if obj == nil || obj.(string) != "astaxie" {
@@ -138,6 +150,7 @@ func TestTreeRouters(t *testing.T) {
 			}
 		}
 	}
+	time.Sleep(time.Second)
 }
 
 func TestStaticPath(t *testing.T) {