diff --git a/.travis.yml b/.travis.yml index 413167d1..8e495e66 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ services: - docker env: global: - - GO_REPO_FULLNAME="github.com/beego/beego" + - GO_REPO_FULLNAME="github.com/beego/beego/v2" matrix: - ORM_DRIVER=sqlite3 ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db - ORM_DRIVER=postgres ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f9f9a1a5..437ba9bb 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -71,7 +71,7 @@ do it in other way. ### Create issues Any significant improvement should be documented as [a GitHub -issue](https://github.com/beego/beego/issues) before anybody +issue](https://github.com/beego/beego/v2/issues) before anybody starts working on it. Also when filing an issue, make sure to answer these five questions: diff --git a/README.md b/README.md index 92de4463..481fa7d4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Beego [![Build Status](https://travis-ci.org/astaxie/beego.svg?branch=master)](https://travis-ci.org/astaxie/beego) [![GoDoc](http://godoc.org/github.com/beego/beego?status.svg)](http://godoc.org/github.com/beego/beego) [![Foundation](https://img.shields.io/badge/Golang-Foundation-green.svg)](http://golangfoundation.org) [![Go Report Card](https://goreportcard.com/badge/github.com/beego/beego)](https://goreportcard.com/report/github.com/beego/beego) +# Beego [![Build Status](https://travis-ci.org/astaxie/beego.svg?branch=master)](https://travis-ci.org/astaxie/beego) [![GoDoc](http://godoc.org/github.com/beego/beego/v2?status.svg)](http://godoc.org/github.com/beego/beego/v2) [![Foundation](https://img.shields.io/badge/Golang-Foundation-green.svg)](http://golangfoundation.org) [![Go Report Card](https://goreportcard.com/badge/github.com/beego/beego/v2)](https://goreportcard.com/report/github.com/beego/beego/v2) Beego is used for rapid development of enterprise application in Go, including RESTful APIs, web apps and backend services. @@ -38,14 +38,14 @@ Beego is compos of four parts: #### Download and install - go get github.com/beego/beego@v2.0.0 + go get github.com/beego/beego/v2@v2.0.0 #### Create file `hello.go` ```go package main -import "github.com/beego/beego/server/web" +import "github.com/beego/beego/v2/server/web" func main() { web.Run() diff --git a/adapter/admin.go b/adapter/admin.go index ef6705dd..527cb201 100644 --- a/adapter/admin.go +++ b/adapter/admin.go @@ -17,8 +17,8 @@ package adapter import ( "time" - _ "github.com/beego/beego/core/admin" - "github.com/beego/beego/server/web" + _ "github.com/beego/beego/v2/core/admin" + "github.com/beego/beego/v2/server/web" ) // FilterMonitorFunc is default monitor filter when admin module is enable. diff --git a/adapter/app.go b/adapter/app.go index a4775011..8502256b 100644 --- a/adapter/app.go +++ b/adapter/app.go @@ -17,9 +17,9 @@ package adapter import ( "net/http" - context2 "github.com/beego/beego/adapter/context" - "github.com/beego/beego/server/web" - "github.com/beego/beego/server/web/context" + context2 "github.com/beego/beego/v2/adapter/context" + "github.com/beego/beego/v2/server/web" + "github.com/beego/beego/v2/server/web/context" ) var ( diff --git a/adapter/beego.go b/adapter/beego.go index 8dd3fab3..331aa786 100644 --- a/adapter/beego.go +++ b/adapter/beego.go @@ -15,8 +15,8 @@ package adapter import ( - "github.com/beego/beego" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2" + "github.com/beego/beego/v2/server/web" ) const ( diff --git a/adapter/cache/cache.go b/adapter/cache/cache.go index 1a492642..f615b26f 100644 --- a/adapter/cache/cache.go +++ b/adapter/cache/cache.go @@ -16,7 +16,7 @@ // Usage: // // import( -// "github.com/beego/beego/cache" +// "github.com/beego/beego/v2/cache" // ) // // bm, err := cache.NewCache("memory", `{"interval":60}`) diff --git a/adapter/cache/cache_adapter.go b/adapter/cache/cache_adapter.go index 7c808c68..cc46cad7 100644 --- a/adapter/cache/cache_adapter.go +++ b/adapter/cache/cache_adapter.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/beego/beego/client/cache" + "github.com/beego/beego/v2/client/cache" ) type newToOldCacheAdapter struct { diff --git a/adapter/cache/conv.go b/adapter/cache/conv.go index 4be3d118..052c4f3b 100644 --- a/adapter/cache/conv.go +++ b/adapter/cache/conv.go @@ -15,7 +15,7 @@ package cache import ( - "github.com/beego/beego/client/cache" + "github.com/beego/beego/v2/client/cache" ) // GetString convert interface to string. diff --git a/adapter/cache/file.go b/adapter/cache/file.go index ba9a66e7..b010a031 100644 --- a/adapter/cache/file.go +++ b/adapter/cache/file.go @@ -15,7 +15,7 @@ package cache import ( - "github.com/beego/beego/client/cache" + "github.com/beego/beego/v2/client/cache" ) // NewFileCache Create new file cache with no config. diff --git a/adapter/cache/memcache/memcache.go b/adapter/cache/memcache/memcache.go index 5f20f09c..16948f65 100644 --- a/adapter/cache/memcache/memcache.go +++ b/adapter/cache/memcache/memcache.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/beego/beego/cache/memcache" -// "github.com/beego/beego/cache" +// _ "github.com/beego/beego/v2/cache/memcache" +// "github.com/beego/beego/v2/cache" // ) // // bm, err := cache.NewCache("memcache", `{"conn":"127.0.0.1:11211"}`) @@ -30,8 +30,8 @@ package memcache import ( - "github.com/beego/beego/adapter/cache" - "github.com/beego/beego/client/cache/memcache" + "github.com/beego/beego/v2/adapter/cache" + "github.com/beego/beego/v2/client/cache/memcache" ) // NewMemCache create new memcache adapter. diff --git a/adapter/cache/memcache/memcache_test.go b/adapter/cache/memcache/memcache_test.go index c22685c3..6382543e 100644 --- a/adapter/cache/memcache/memcache_test.go +++ b/adapter/cache/memcache/memcache_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/beego/beego/adapter/cache" + "github.com/beego/beego/v2/adapter/cache" ) func TestMemcacheCache(t *testing.T) { diff --git a/adapter/cache/memory.go b/adapter/cache/memory.go index c1625bef..dfb80aa4 100644 --- a/adapter/cache/memory.go +++ b/adapter/cache/memory.go @@ -15,7 +15,7 @@ package cache import ( - "github.com/beego/beego/client/cache" + "github.com/beego/beego/v2/client/cache" ) // NewMemoryCache returns a new MemoryCache. diff --git a/adapter/cache/redis/redis.go b/adapter/cache/redis/redis.go index 6fc7e368..bfbeeb9c 100644 --- a/adapter/cache/redis/redis.go +++ b/adapter/cache/redis/redis.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/beego/beego/cache/redis" -// "github.com/beego/beego/cache" +// _ "github.com/beego/beego/v2/cache/redis" +// "github.com/beego/beego/v2/cache" // ) // // bm, err := cache.NewCache("redis", `{"conn":"127.0.0.1:11211"}`) @@ -30,8 +30,8 @@ package redis import ( - "github.com/beego/beego/adapter/cache" - redis2 "github.com/beego/beego/client/cache/redis" + "github.com/beego/beego/v2/adapter/cache" + redis2 "github.com/beego/beego/v2/client/cache/redis" ) var ( diff --git a/adapter/cache/redis/redis_test.go b/adapter/cache/redis/redis_test.go index c34b7310..a6c0d70b 100644 --- a/adapter/cache/redis/redis_test.go +++ b/adapter/cache/redis/redis_test.go @@ -22,7 +22,7 @@ import ( "github.com/gomodule/redigo/redis" - "github.com/beego/beego/adapter/cache" + "github.com/beego/beego/v2/adapter/cache" ) func TestRedisCache(t *testing.T) { diff --git a/adapter/cache/ssdb/ssdb.go b/adapter/cache/ssdb/ssdb.go index 22c330c1..8f6e50d3 100644 --- a/adapter/cache/ssdb/ssdb.go +++ b/adapter/cache/ssdb/ssdb.go @@ -1,8 +1,8 @@ package ssdb import ( - "github.com/beego/beego/adapter/cache" - ssdb2 "github.com/beego/beego/client/cache/ssdb" + "github.com/beego/beego/v2/adapter/cache" + ssdb2 "github.com/beego/beego/v2/client/cache/ssdb" ) // NewSsdbCache create new ssdb adapter. diff --git a/adapter/cache/ssdb/ssdb_test.go b/adapter/cache/ssdb/ssdb_test.go index b6a4d89f..a0b736d5 100644 --- a/adapter/cache/ssdb/ssdb_test.go +++ b/adapter/cache/ssdb/ssdb_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/beego/beego/adapter/cache" + "github.com/beego/beego/v2/adapter/cache" ) func TestSsdbcacheCache(t *testing.T) { diff --git a/adapter/config.go b/adapter/config.go index 86425d42..36e0a9c4 100644 --- a/adapter/config.go +++ b/adapter/config.go @@ -15,9 +15,9 @@ package adapter import ( - "github.com/beego/beego/adapter/session" - newCfg "github.com/beego/beego/core/config" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/adapter/session" + newCfg "github.com/beego/beego/v2/core/config" + "github.com/beego/beego/v2/server/web" ) // Config is the main struct for BConfig diff --git a/adapter/config/adapter.go b/adapter/config/adapter.go index 4af024b2..f7cfcb19 100644 --- a/adapter/config/adapter.go +++ b/adapter/config/adapter.go @@ -17,7 +17,7 @@ package config import ( "github.com/pkg/errors" - "github.com/beego/beego/core/config" + "github.com/beego/beego/v2/core/config" ) type newToOldConfigerAdapter struct { diff --git a/adapter/config/config.go b/adapter/config/config.go index 4c992aff..a935e281 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/config" +// import "github.com/beego/beego/v2/config" // Examples. // // cnf, err := config.NewConfig("ini", "config.conf") @@ -41,7 +41,7 @@ package config import ( - "github.com/beego/beego/core/config" + "github.com/beego/beego/v2/core/config" ) // Configer defines how to get and set value from configuration raw data. diff --git a/adapter/config/env/env.go b/adapter/config/env/env.go index da149feb..0be4fe6b 100644 --- a/adapter/config/env/env.go +++ b/adapter/config/env/env.go @@ -17,7 +17,7 @@ package env import ( - "github.com/beego/beego/core/config/env" + "github.com/beego/beego/v2/core/config/env" ) // Get returns a value by key. diff --git a/adapter/config/fake.go b/adapter/config/fake.go index d8cc7416..a2b53167 100644 --- a/adapter/config/fake.go +++ b/adapter/config/fake.go @@ -15,7 +15,7 @@ package config import ( - "github.com/beego/beego/core/config" + "github.com/beego/beego/v2/core/config" ) // NewFakeConfig return a fake Configer diff --git a/adapter/config/json.go b/adapter/config/json.go index 08d3e8a5..b5a481cd 100644 --- a/adapter/config/json.go +++ b/adapter/config/json.go @@ -15,5 +15,5 @@ package config import ( - _ "github.com/beego/beego/core/config/json" + _ "github.com/beego/beego/v2/core/config/json" ) diff --git a/adapter/config/xml/xml.go b/adapter/config/xml/xml.go index 5af8df29..190cee97 100644 --- a/adapter/config/xml/xml.go +++ b/adapter/config/xml/xml.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/beego/beego/config/xml" -// "github.com/beego/beego/config" +// _ "github.com/beego/beego/v2/config/xml" +// "github.com/beego/beego/v2/config" // ) // // cnf, err := config.NewConfig("xml", "config.xml") @@ -30,5 +30,5 @@ package xml import ( - _ "github.com/beego/beego/core/config/xml" + _ "github.com/beego/beego/v2/core/config/xml" ) diff --git a/adapter/config/xml/xml_test.go b/adapter/config/xml/xml_test.go index 87e3a079..1799b067 100644 --- a/adapter/config/xml/xml_test.go +++ b/adapter/config/xml/xml_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/beego/beego/adapter/config" + "github.com/beego/beego/v2/adapter/config" ) func TestXML(t *testing.T) { diff --git a/adapter/config/yaml/yaml.go b/adapter/config/yaml/yaml.go index f6ef9d82..8d0bb697 100644 --- a/adapter/config/yaml/yaml.go +++ b/adapter/config/yaml/yaml.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/beego/beego/config/yaml" -// "github.com/beego/beego/config" +// _ "github.com/beego/beego/v2/config/yaml" +// "github.com/beego/beego/v2/config" // ) // // cnf, err := config.NewConfig("yaml", "config.yaml") @@ -30,5 +30,5 @@ package yaml import ( - _ "github.com/beego/beego/core/config/yaml" + _ "github.com/beego/beego/v2/core/config/yaml" ) diff --git a/adapter/config/yaml/yaml_test.go b/adapter/config/yaml/yaml_test.go index 4f7e07f3..d567b554 100644 --- a/adapter/config/yaml/yaml_test.go +++ b/adapter/config/yaml/yaml_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/beego/beego/adapter/config" + "github.com/beego/beego/v2/adapter/config" ) func TestYaml(t *testing.T) { diff --git a/adapter/context/acceptencoder.go b/adapter/context/acceptencoder.go index b860ab36..69a3acbc 100644 --- a/adapter/context/acceptencoder.go +++ b/adapter/context/acceptencoder.go @@ -19,7 +19,7 @@ import ( "net/http" "os" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) // InitGzip init the gzipcompress diff --git a/adapter/context/context.go b/adapter/context/context.go index 99eb17ae..16e631fc 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/context" +// import "github.com/beego/beego/v2/context" // // ctx := context.Context{Request:req,ResponseWriter:rw} // @@ -27,7 +27,7 @@ import ( "net" "net/http" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) // commonly used mime-types diff --git a/adapter/context/input.go b/adapter/context/input.go index fdbdd358..ac3e0c72 100644 --- a/adapter/context/input.go +++ b/adapter/context/input.go @@ -15,7 +15,7 @@ package context import ( - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) // BeegoInput operates the http request header, data, cookie and body. diff --git a/adapter/context/output.go b/adapter/context/output.go index 78ccc419..5152ccf5 100644 --- a/adapter/context/output.go +++ b/adapter/context/output.go @@ -15,7 +15,7 @@ package context import ( - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) // BeegoOutput does work for sending response header. diff --git a/adapter/context/renderer.go b/adapter/context/renderer.go index e443c83b..2c5a53c1 100644 --- a/adapter/context/renderer.go +++ b/adapter/context/renderer.go @@ -1,7 +1,7 @@ package context import ( - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) // Renderer defines an http response renderer diff --git a/adapter/controller.go b/adapter/controller.go index 2f828887..170672b4 100644 --- a/adapter/controller.go +++ b/adapter/controller.go @@ -18,10 +18,10 @@ import ( "mime/multipart" "net/url" - "github.com/beego/beego/adapter/session" - webContext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/adapter/session" + webContext "github.com/beego/beego/v2/server/web/context" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/server/web" ) var ( diff --git a/adapter/error.go b/adapter/error.go index 7524eff9..a4d0bc00 100644 --- a/adapter/error.go +++ b/adapter/error.go @@ -17,10 +17,10 @@ package adapter import ( "net/http" - "github.com/beego/beego/adapter/context" - beecontext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/adapter/context" + beecontext "github.com/beego/beego/v2/server/web/context" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/server/web" ) const ( diff --git a/adapter/filter.go b/adapter/filter.go index 803ec6c6..660193b9 100644 --- a/adapter/filter.go +++ b/adapter/filter.go @@ -15,9 +15,9 @@ package adapter import ( - "github.com/beego/beego/adapter/context" - "github.com/beego/beego/server/web" - beecontext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/adapter/context" + "github.com/beego/beego/v2/server/web" + beecontext "github.com/beego/beego/v2/server/web/context" ) // FilterFunc defines a filter function which is invoked before the controller handler is executed. diff --git a/adapter/flash.go b/adapter/flash.go index 806345a6..aab9b3ce 100644 --- a/adapter/flash.go +++ b/adapter/flash.go @@ -15,7 +15,7 @@ package adapter import ( - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/server/web" ) // FlashData is a tools to maintain data when using across request. diff --git a/adapter/fs.go b/adapter/fs.go index b2d2a567..168e312a 100644 --- a/adapter/fs.go +++ b/adapter/fs.go @@ -18,7 +18,7 @@ import ( "net/http" "path/filepath" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/server/web" ) type FileSystem web.FileSystem diff --git a/adapter/grace/grace.go b/adapter/grace/grace.go index 12928042..6e582bac 100644 --- a/adapter/grace/grace.go +++ b/adapter/grace/grace.go @@ -22,7 +22,7 @@ // "net/http" // "os" // -// "github.com/beego/beego/grace" +// "github.com/beego/beego/v2/grace" // ) // // func handler(w http.ResponseWriter, r *http.Request) { @@ -46,7 +46,7 @@ import ( "net/http" "time" - "github.com/beego/beego/server/web/grace" + "github.com/beego/beego/v2/server/web/grace" ) const ( diff --git a/adapter/grace/server.go b/adapter/grace/server.go index 5e659134..95ca05b4 100644 --- a/adapter/grace/server.go +++ b/adapter/grace/server.go @@ -3,7 +3,7 @@ package grace import ( "os" - "github.com/beego/beego/server/web/grace" + "github.com/beego/beego/v2/server/web/grace" ) // Server embedded http.Server diff --git a/adapter/httplib/httplib.go b/adapter/httplib/httplib.go index 593cf39a..0a182cae 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/httplib" +// import "github.com/beego/beego/v2/httplib" // // b := httplib.Post("http://beego.me/") // b.Param("username","astaxie") @@ -38,7 +38,7 @@ import ( "net/url" "time" - "github.com/beego/beego/client/httplib" + "github.com/beego/beego/v2/client/httplib" ) // SetDefaultSetting Overwrite default settings diff --git a/adapter/log.go b/adapter/log.go index 0042b7b5..25e82d26 100644 --- a/adapter/log.go +++ b/adapter/log.go @@ -17,13 +17,13 @@ package adapter import ( "strings" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" - webLog "github.com/beego/beego/core/logs" + webLog "github.com/beego/beego/v2/core/logs" ) // Log levels to control the logging output. -// Deprecated: use github.com/beego/beego/logs instead. +// Deprecated: use github.com/beego/beego/v2/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/logs instead. +// Deprecated: use github.com/beego/beego/v2/logs instead. var BeeLogger = logs.GetBeeLogger() // SetLevel sets the global log level used by the simple logger. -// Deprecated: use github.com/beego/beego/logs instead. +// Deprecated: use github.com/beego/beego/v2/logs instead. func SetLevel(l int) { logs.SetLevel(l) } // SetLogFuncCall set the CallDepth, default is 3 -// Deprecated: use github.com/beego/beego/logs instead. +// Deprecated: use github.com/beego/beego/v2/logs instead. func SetLogFuncCall(b bool) { logs.SetLogFuncCall(b) } // SetLogger sets a new logger. -// Deprecated: use github.com/beego/beego/logs instead. +// Deprecated: use github.com/beego/beego/v2/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/logs instead. +// Deprecated: use github.com/beego/beego/v2/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/logs instead. +// Deprecated: use github.com/beego/beego/v2/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/logs instead. +// Deprecated: use github.com/beego/beego/v2/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/logs instead. +// Deprecated: use github.com/beego/beego/v2/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/logs instead. +// Deprecated: use github.com/beego/beego/v2/logs instead. func Warning(v ...interface{}) { logs.Warning(generateFmtStr(len(v)), v...) } // Warn compatibility alias for Warning() -// Deprecated: use github.com/beego/beego/logs instead. +// Deprecated: use github.com/beego/beego/v2/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/logs instead. +// Deprecated: use github.com/beego/beego/v2/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/logs instead. +// Deprecated: use github.com/beego/beego/v2/logs instead. func Informational(v ...interface{}) { logs.Informational(generateFmtStr(len(v)), v...) } // Info compatibility alias for Warning() -// Deprecated: use github.com/beego/beego/logs instead. +// Deprecated: use github.com/beego/beego/v2/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/logs instead. +// Deprecated: use github.com/beego/beego/v2/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/logs instead. +// Deprecated: use github.com/beego/beego/v2/logs instead. func Trace(v ...interface{}) { logs.Trace(generateFmtStr(len(v)), v...) } diff --git a/adapter/logs/accesslog.go b/adapter/logs/accesslog.go index f702a820..f4370a5d 100644 --- a/adapter/logs/accesslog.go +++ b/adapter/logs/accesslog.go @@ -15,7 +15,7 @@ package logs import ( - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) // AccessLogRecord struct for holding access log data. diff --git a/adapter/logs/alils/alils.go b/adapter/logs/alils/alils.go index d5d6707d..2f700457 100644 --- a/adapter/logs/alils/alils.go +++ b/adapter/logs/alils/alils.go @@ -1,5 +1,5 @@ package alils import ( - _ "github.com/beego/beego/core/logs/alils" + _ "github.com/beego/beego/v2/core/logs/alils" ) diff --git a/adapter/logs/es/es.go b/adapter/logs/es/es.go index e85c0170..124e3fdd 100644 --- a/adapter/logs/es/es.go +++ b/adapter/logs/es/es.go @@ -1,5 +1,5 @@ package es import ( - _ "github.com/beego/beego/core/logs/es" + _ "github.com/beego/beego/v2/core/logs/es" ) diff --git a/adapter/logs/log.go b/adapter/logs/log.go index 8efe9a91..9d098d8f 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/logs" +// import "github.com/beego/beego/v2/logs" // // log := NewLogger(10000) // log.SetLogger("console", "") @@ -37,7 +37,7 @@ import ( "log" "time" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) // RFC5424 log message levels. diff --git a/adapter/logs/log_adapter.go b/adapter/logs/log_adapter.go index 26eff679..e767724e 100644 --- a/adapter/logs/log_adapter.go +++ b/adapter/logs/log_adapter.go @@ -17,7 +17,7 @@ package logs import ( "time" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) type oldToNewAdapter struct { diff --git a/adapter/logs/logger.go b/adapter/logs/logger.go index a4eff63b..58bdfc30 100644 --- a/adapter/logs/logger.go +++ b/adapter/logs/logger.go @@ -15,7 +15,7 @@ package logs import ( - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) // ColorByStatus return color by http code diff --git a/adapter/metric/prometheus.go b/adapter/metric/prometheus.go index 704c6c05..7abd0e5a 100644 --- a/adapter/metric/prometheus.go +++ b/adapter/metric/prometheus.go @@ -23,9 +23,9 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/beego/beego" - "github.com/beego/beego/core/logs" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2" + "github.com/beego/beego/v2/core/logs" + "github.com/beego/beego/v2/server/web" ) func PrometheusMiddleWare(next http.Handler) http.Handler { diff --git a/adapter/metric/prometheus_test.go b/adapter/metric/prometheus_test.go index 3a733071..e87e06d6 100644 --- a/adapter/metric/prometheus_test.go +++ b/adapter/metric/prometheus_test.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/beego/beego/adapter/context" + "github.com/beego/beego/v2/adapter/context" ) func TestPrometheusMiddleWare(t *testing.T) { diff --git a/adapter/migration/ddl.go b/adapter/migration/ddl.go index 9fc0cda8..93be2d7d 100644 --- a/adapter/migration/ddl.go +++ b/adapter/migration/ddl.go @@ -15,7 +15,7 @@ package migration import ( - "github.com/beego/beego/client/orm/migration" + "github.com/beego/beego/v2/client/orm/migration" ) // Index struct defines the structure of Index Columns diff --git a/adapter/migration/migration.go b/adapter/migration/migration.go index 7bb8cea2..57202232 100644 --- a/adapter/migration/migration.go +++ b/adapter/migration/migration.go @@ -28,7 +28,7 @@ package migration import ( - "github.com/beego/beego/client/orm/migration" + "github.com/beego/beego/v2/client/orm/migration" ) // const the data format for the bee generate migration datatype diff --git a/adapter/namespace.go b/adapter/namespace.go index 27e21dfa..709f6aa5 100644 --- a/adapter/namespace.go +++ b/adapter/namespace.go @@ -17,10 +17,10 @@ package adapter import ( "net/http" - adtContext "github.com/beego/beego/adapter/context" - "github.com/beego/beego/server/web/context" + adtContext "github.com/beego/beego/v2/adapter/context" + "github.com/beego/beego/v2/server/web/context" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/server/web" ) type namespaceCond func(*adtContext.Context) bool @@ -91,28 +91,28 @@ func oldToNewFilter(filter []FilterFunc) []web.FilterFunc { } // Router same as beego.Rourer -// refer: https://godoc.org/github.com/beego/beego#Router +// refer: https://godoc.org/github.com/beego/beego/v2#Router func (n *Namespace) Router(rootpath string, c ControllerInterface, mappingMethods ...string) *Namespace { (*web.Namespace)(n).Router(rootpath, c, mappingMethods...) return n } // AutoRouter same as beego.AutoRouter -// refer: https://godoc.org/github.com/beego/beego#AutoRouter +// refer: https://godoc.org/github.com/beego/beego/v2#AutoRouter func (n *Namespace) AutoRouter(c ControllerInterface) *Namespace { (*web.Namespace)(n).AutoRouter(c) return n } // AutoPrefix same as beego.AutoPrefix -// refer: https://godoc.org/github.com/beego/beego#AutoPrefix +// refer: https://godoc.org/github.com/beego/beego/v2#AutoPrefix func (n *Namespace) AutoPrefix(prefix string, c ControllerInterface) *Namespace { (*web.Namespace)(n).AutoPrefix(prefix, c) return n } // Get same as beego.Get -// refer: https://godoc.org/github.com/beego/beego#Get +// refer: https://godoc.org/github.com/beego/beego/v2#Get func (n *Namespace) Get(rootpath string, f FilterFunc) *Namespace { (*web.Namespace)(n).Get(rootpath, func(ctx *context.Context) { f((*adtContext.Context)(ctx)) @@ -121,7 +121,7 @@ func (n *Namespace) Get(rootpath string, f FilterFunc) *Namespace { } // Post same as beego.Post -// refer: https://godoc.org/github.com/beego/beego#Post +// refer: https://godoc.org/github.com/beego/beego/v2#Post func (n *Namespace) Post(rootpath string, f FilterFunc) *Namespace { (*web.Namespace)(n).Post(rootpath, func(ctx *context.Context) { f((*adtContext.Context)(ctx)) @@ -130,7 +130,7 @@ func (n *Namespace) Post(rootpath string, f FilterFunc) *Namespace { } // Delete same as beego.Delete -// refer: https://godoc.org/github.com/beego/beego#Delete +// refer: https://godoc.org/github.com/beego/beego/v2#Delete func (n *Namespace) Delete(rootpath string, f FilterFunc) *Namespace { (*web.Namespace)(n).Delete(rootpath, func(ctx *context.Context) { f((*adtContext.Context)(ctx)) @@ -139,7 +139,7 @@ func (n *Namespace) Delete(rootpath string, f FilterFunc) *Namespace { } // Put same as beego.Put -// refer: https://godoc.org/github.com/beego/beego#Put +// refer: https://godoc.org/github.com/beego/beego/v2#Put func (n *Namespace) Put(rootpath string, f FilterFunc) *Namespace { (*web.Namespace)(n).Put(rootpath, func(ctx *context.Context) { f((*adtContext.Context)(ctx)) @@ -148,7 +148,7 @@ func (n *Namespace) Put(rootpath string, f FilterFunc) *Namespace { } // Head same as beego.Head -// refer: https://godoc.org/github.com/beego/beego#Head +// refer: https://godoc.org/github.com/beego/beego/v2#Head func (n *Namespace) Head(rootpath string, f FilterFunc) *Namespace { (*web.Namespace)(n).Head(rootpath, func(ctx *context.Context) { f((*adtContext.Context)(ctx)) @@ -157,7 +157,7 @@ func (n *Namespace) Head(rootpath string, f FilterFunc) *Namespace { } // Options same as beego.Options -// refer: https://godoc.org/github.com/beego/beego#Options +// refer: https://godoc.org/github.com/beego/beego/v2#Options func (n *Namespace) Options(rootpath string, f FilterFunc) *Namespace { (*web.Namespace)(n).Options(rootpath, func(ctx *context.Context) { f((*adtContext.Context)(ctx)) @@ -166,7 +166,7 @@ func (n *Namespace) Options(rootpath string, f FilterFunc) *Namespace { } // Patch same as beego.Patch -// refer: https://godoc.org/github.com/beego/beego#Patch +// refer: https://godoc.org/github.com/beego/beego/v2#Patch func (n *Namespace) Patch(rootpath string, f FilterFunc) *Namespace { (*web.Namespace)(n).Patch(rootpath, func(ctx *context.Context) { f((*adtContext.Context)(ctx)) @@ -175,7 +175,7 @@ func (n *Namespace) Patch(rootpath string, f FilterFunc) *Namespace { } // Any same as beego.Any -// refer: https://godoc.org/github.com/beego/beego#Any +// refer: https://godoc.org/github.com/beego/beego/v2#Any func (n *Namespace) Any(rootpath string, f FilterFunc) *Namespace { (*web.Namespace)(n).Any(rootpath, func(ctx *context.Context) { f((*adtContext.Context)(ctx)) @@ -184,14 +184,14 @@ func (n *Namespace) Any(rootpath string, f FilterFunc) *Namespace { } // Handler same as beego.Handler -// refer: https://godoc.org/github.com/beego/beego#Handler +// refer: https://godoc.org/github.com/beego/beego/v2#Handler func (n *Namespace) Handler(rootpath string, h http.Handler) *Namespace { (*web.Namespace)(n).Handler(rootpath, h) return n } // Include add include class -// refer: https://godoc.org/github.com/beego/beego#Include +// refer: https://godoc.org/github.com/beego/beego/v2#Include func (n *Namespace) Include(cList ...ControllerInterface) *Namespace { nL := oldToNewCtrlIntfs(cList) (*web.Namespace)(n).Include(nL...) diff --git a/adapter/orm/cmd.go b/adapter/orm/cmd.go index 21a4c368..d8399c90 100644 --- a/adapter/orm/cmd.go +++ b/adapter/orm/cmd.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // RunCommand listen for orm command and then run it if command arguments passed. diff --git a/adapter/orm/db.go b/adapter/orm/db.go index 006759e6..3cdd33cd 100644 --- a/adapter/orm/db.go +++ b/adapter/orm/db.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) var ( diff --git a/adapter/orm/db_alias.go b/adapter/orm/db_alias.go index aaef916a..f910c3f9 100644 --- a/adapter/orm/db_alias.go +++ b/adapter/orm/db_alias.go @@ -19,7 +19,7 @@ import ( "database/sql" "time" - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // DriverType database driver constant int. diff --git a/adapter/orm/models.go b/adapter/orm/models.go index 2e07ef1f..ee6b9194 100644 --- a/adapter/orm/models.go +++ b/adapter/orm/models.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // ResetModelCache Clean model cache. Then you can re-RegisterModel. diff --git a/adapter/orm/models_boot.go b/adapter/orm/models_boot.go index df6a57d0..e004f35a 100644 --- a/adapter/orm/models_boot.go +++ b/adapter/orm/models_boot.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // RegisterModel register models diff --git a/adapter/orm/models_fields.go b/adapter/orm/models_fields.go index 928e94e1..ff0b0e87 100644 --- a/adapter/orm/models_fields.go +++ b/adapter/orm/models_fields.go @@ -17,7 +17,7 @@ package orm import ( "time" - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // Define the Type enum diff --git a/adapter/orm/orm.go b/adapter/orm/orm.go index b7bb75f4..c603de2f 100644 --- a/adapter/orm/orm.go +++ b/adapter/orm/orm.go @@ -21,7 +21,7 @@ // // import ( // "fmt" -// "github.com/beego/beego/orm" +// "github.com/beego/beego/v2/orm" // _ "github.com/go-sql-driver/mysql" // import your used driver // ) // @@ -58,9 +58,9 @@ import ( "database/sql" "errors" - "github.com/beego/beego/client/orm" - "github.com/beego/beego/client/orm/hints" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/client/orm/hints" + "github.com/beego/beego/v2/core/utils" ) // DebugQueries define the debug diff --git a/adapter/orm/orm_conds.go b/adapter/orm/orm_conds.go index c06930da..387caac2 100644 --- a/adapter/orm/orm_conds.go +++ b/adapter/orm/orm_conds.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // ExprSep define the expression separation diff --git a/adapter/orm/orm_log.go b/adapter/orm/orm_log.go index 278c427f..98c1522e 100644 --- a/adapter/orm/orm_log.go +++ b/adapter/orm/orm_log.go @@ -17,7 +17,7 @@ package orm import ( "io" - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // Log implement the log.Logger diff --git a/adapter/orm/orm_queryset.go b/adapter/orm/orm_queryset.go index 9fe71112..b1f4c165 100644 --- a/adapter/orm/orm_queryset.go +++ b/adapter/orm/orm_queryset.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // define Col operations diff --git a/adapter/orm/qb.go b/adapter/orm/qb.go index 6d764884..57c8d62a 100644 --- a/adapter/orm/qb.go +++ b/adapter/orm/qb.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // QueryBuilder is the Query builder interface diff --git a/adapter/orm/qb_mysql.go b/adapter/orm/qb_mysql.go index cba11e95..10b38ea9 100644 --- a/adapter/orm/qb_mysql.go +++ b/adapter/orm/qb_mysql.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // CommaSpace is the separation diff --git a/adapter/orm/qb_tidb.go b/adapter/orm/qb_tidb.go index e2a28458..d3c94e0f 100644 --- a/adapter/orm/qb_tidb.go +++ b/adapter/orm/qb_tidb.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // TiDBQueryBuilder is the SQL build diff --git a/adapter/orm/query_setter_adapter.go b/adapter/orm/query_setter_adapter.go index dfe0ec86..7f506759 100644 --- a/adapter/orm/query_setter_adapter.go +++ b/adapter/orm/query_setter_adapter.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) type baseQuerySetter struct { diff --git a/adapter/orm/types.go b/adapter/orm/types.go index a5698eaa..428f8b14 100644 --- a/adapter/orm/types.go +++ b/adapter/orm/types.go @@ -18,7 +18,7 @@ import ( "context" "database/sql" - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // Params stores the Params diff --git a/adapter/orm/utils.go b/adapter/orm/utils.go index 900d3b1f..22bf8d63 100644 --- a/adapter/orm/utils.go +++ b/adapter/orm/utils.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) type fn func(string) string diff --git a/adapter/plugins/apiauth/apiauth.go b/adapter/plugins/apiauth/apiauth.go index cfd54324..fd0c7ff4 100644 --- a/adapter/plugins/apiauth/apiauth.go +++ b/adapter/plugins/apiauth/apiauth.go @@ -16,8 +16,8 @@ // // Simple Usage: // import( -// "github.com/beego/beego" -// "github.com/beego/beego/plugins/apiauth" +// "github.com/beego/beego/v2" +// "github.com/beego/beego/v2/plugins/apiauth" // ) // // func main(){ @@ -58,10 +58,10 @@ package apiauth import ( "net/url" - beego "github.com/beego/beego/adapter" - "github.com/beego/beego/adapter/context" - beecontext "github.com/beego/beego/server/web/context" - "github.com/beego/beego/server/web/filter/apiauth" + beego "github.com/beego/beego/v2/adapter" + "github.com/beego/beego/v2/adapter/context" + beecontext "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/filter/apiauth" ) // AppIDToAppSecret is used to get appsecret throw appid diff --git a/adapter/plugins/auth/basic.go b/adapter/plugins/auth/basic.go index 75677a84..4ef3343f 100644 --- a/adapter/plugins/auth/basic.go +++ b/adapter/plugins/auth/basic.go @@ -15,8 +15,8 @@ // Package auth provides handlers to enable basic auth support. // Simple Usage: // import( -// "github.com/beego/beego" -// "github.com/beego/beego/plugins/auth" +// "github.com/beego/beego/v2" +// "github.com/beego/beego/v2/plugins/auth" // ) // // func main(){ @@ -38,10 +38,10 @@ package auth import ( "net/http" - beego "github.com/beego/beego/adapter" - "github.com/beego/beego/adapter/context" - beecontext "github.com/beego/beego/server/web/context" - "github.com/beego/beego/server/web/filter/auth" + beego "github.com/beego/beego/v2/adapter" + "github.com/beego/beego/v2/adapter/context" + beecontext "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/filter/auth" ) // Basic is the http basic auth diff --git a/adapter/plugins/authz/authz.go b/adapter/plugins/authz/authz.go index 00cddb45..114c8c9a 100644 --- a/adapter/plugins/authz/authz.go +++ b/adapter/plugins/authz/authz.go @@ -15,8 +15,8 @@ // Package authz provides handlers to enable ACL, RBAC, ABAC authorization support. // Simple Usage: // import( -// "github.com/beego/beego" -// "github.com/beego/beego/plugins/authz" +// "github.com/beego/beego/v2" +// "github.com/beego/beego/v2/plugins/authz" // "github.com/casbin/casbin" // ) // @@ -44,10 +44,10 @@ import ( "github.com/casbin/casbin" - beego "github.com/beego/beego/adapter" - "github.com/beego/beego/adapter/context" - beecontext "github.com/beego/beego/server/web/context" - "github.com/beego/beego/server/web/filter/authz" + beego "github.com/beego/beego/v2/adapter" + "github.com/beego/beego/v2/adapter/context" + beecontext "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/filter/authz" ) // NewAuthorizer returns the authorizer. diff --git a/adapter/plugins/authz/authz_test.go b/adapter/plugins/authz/authz_test.go index 6e21c726..cb652725 100644 --- a/adapter/plugins/authz/authz_test.go +++ b/adapter/plugins/authz/authz_test.go @@ -19,9 +19,9 @@ import ( "net/http/httptest" "testing" - beego "github.com/beego/beego/adapter" - "github.com/beego/beego/adapter/context" - "github.com/beego/beego/adapter/plugins/auth" + beego "github.com/beego/beego/v2/adapter" + "github.com/beego/beego/v2/adapter/context" + "github.com/beego/beego/v2/adapter/plugins/auth" "github.com/casbin/casbin" ) diff --git a/adapter/plugins/cors/cors.go b/adapter/plugins/cors/cors.go index 5e8a5cd9..6a836585 100644 --- a/adapter/plugins/cors/cors.go +++ b/adapter/plugins/cors/cors.go @@ -15,8 +15,8 @@ // Package cors provides handlers to enable CORS support. // Usage // import ( -// "github.com/beego/beego" -// "github.com/beego/beego/plugins/cors" +// "github.com/beego/beego/v2" +// "github.com/beego/beego/v2/plugins/cors" // ) // // func main() { @@ -36,11 +36,11 @@ package cors import ( - beego "github.com/beego/beego/adapter" - beecontext "github.com/beego/beego/server/web/context" - "github.com/beego/beego/server/web/filter/cors" + beego "github.com/beego/beego/v2/adapter" + beecontext "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/filter/cors" - "github.com/beego/beego/adapter/context" + "github.com/beego/beego/v2/adapter/context" ) // Options represents Access Control options. diff --git a/adapter/policy.go b/adapter/policy.go index 7e0b8655..c0b95601 100644 --- a/adapter/policy.go +++ b/adapter/policy.go @@ -15,9 +15,9 @@ package adapter import ( - "github.com/beego/beego/adapter/context" - "github.com/beego/beego/server/web" - beecontext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/adapter/context" + "github.com/beego/beego/v2/server/web" + beecontext "github.com/beego/beego/v2/server/web/context" ) // PolicyFunc defines a policy function which is invoked before the controller handler is executed. diff --git a/adapter/router.go b/adapter/router.go index 325f1f42..900e3eb7 100644 --- a/adapter/router.go +++ b/adapter/router.go @@ -18,10 +18,10 @@ import ( "net/http" "time" - beecontext "github.com/beego/beego/adapter/context" - "github.com/beego/beego/server/web/context" + beecontext "github.com/beego/beego/v2/adapter/context" + "github.com/beego/beego/v2/server/web/context" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/server/web" ) // default filter execution points diff --git a/adapter/session/couchbase/sess_couchbase.go b/adapter/session/couchbase/sess_couchbase.go index 5e578675..4ce2d69d 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/session/couchbase" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/couchbase" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -36,8 +36,8 @@ import ( "context" "net/http" - "github.com/beego/beego/adapter/session" - beecb "github.com/beego/beego/server/web/session/couchbase" + "github.com/beego/beego/v2/adapter/session" + beecb "github.com/beego/beego/v2/server/web/session/couchbase" ) // SessionStore store each session diff --git a/adapter/session/ledis/ledis_session.go b/adapter/session/ledis/ledis_session.go index ec0ba536..c42c1787 100644 --- a/adapter/session/ledis/ledis_session.go +++ b/adapter/session/ledis/ledis_session.go @@ -5,8 +5,8 @@ import ( "context" "net/http" - "github.com/beego/beego/adapter/session" - beeLedis "github.com/beego/beego/server/web/session/ledis" + "github.com/beego/beego/v2/adapter/session" + beeLedis "github.com/beego/beego/v2/server/web/session/ledis" ) // SessionStore ledis session store diff --git a/adapter/session/memcache/sess_memcache.go b/adapter/session/memcache/sess_memcache.go index 7bff7de8..e81d06c6 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/session/memcache" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/memcache" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -36,9 +36,9 @@ import ( "context" "net/http" - "github.com/beego/beego/adapter/session" + "github.com/beego/beego/v2/adapter/session" - beemem "github.com/beego/beego/server/web/session/memcache" + beemem "github.com/beego/beego/v2/server/web/session/memcache" ) // SessionStore memcache session store diff --git a/adapter/session/mysql/sess_mysql.go b/adapter/session/mysql/sess_mysql.go index 5dbf656d..d47e7496 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/session/mysql" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/mysql" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -44,8 +44,8 @@ import ( "context" "net/http" - "github.com/beego/beego/adapter/session" - "github.com/beego/beego/server/web/session/mysql" + "github.com/beego/beego/v2/adapter/session" + "github.com/beego/beego/v2/server/web/session/mysql" // import mysql driver _ "github.com/go-sql-driver/mysql" diff --git a/adapter/session/postgres/sess_postgresql.go b/adapter/session/postgres/sess_postgresql.go index 2fb52c9d..a24794d6 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/session/postgresql" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/postgresql" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -54,11 +54,11 @@ import ( "context" "net/http" - "github.com/beego/beego/adapter/session" + "github.com/beego/beego/v2/adapter/session" // import postgresql Driver _ "github.com/lib/pq" - "github.com/beego/beego/server/web/session/postgres" + "github.com/beego/beego/v2/server/web/session/postgres" ) // SessionStore postgresql session store diff --git a/adapter/session/provider_adapter.go b/adapter/session/provider_adapter.go index 7225fba6..3e62aa63 100644 --- a/adapter/session/provider_adapter.go +++ b/adapter/session/provider_adapter.go @@ -17,7 +17,7 @@ package session import ( "context" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) type oldToNewProviderAdapter struct { diff --git a/adapter/session/redis/sess_redis.go b/adapter/session/redis/sess_redis.go index 9d9f0809..a5fcedf6 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/session/redis" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/redis" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -36,9 +36,9 @@ import ( "context" "net/http" - "github.com/beego/beego/adapter/session" + "github.com/beego/beego/v2/adapter/session" - beeRedis "github.com/beego/beego/server/web/session/redis" + beeRedis "github.com/beego/beego/v2/server/web/session/redis" ) // MaxPoolSize redis max pool size diff --git a/adapter/session/redis_cluster/redis_cluster.go b/adapter/session/redis_cluster/redis_cluster.go index 516990b3..f4c8e4d1 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/session/redis_cluster" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/redis_cluster" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -36,8 +36,8 @@ import ( "context" "net/http" - "github.com/beego/beego/adapter/session" - cluster "github.com/beego/beego/server/web/session/redis_cluster" + "github.com/beego/beego/v2/adapter/session" + cluster "github.com/beego/beego/v2/server/web/session/redis_cluster" ) // MaxPoolSize redis_cluster max pool size diff --git a/adapter/session/redis_sentinel/sess_redis_sentinel.go b/adapter/session/redis_sentinel/sess_redis_sentinel.go index f0033597..4498e55d 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/session/redis_sentinel" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/redis_sentinel" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -36,9 +36,9 @@ import ( "context" "net/http" - "github.com/beego/beego/adapter/session" + "github.com/beego/beego/v2/adapter/session" - sentinel "github.com/beego/beego/server/web/session/redis_sentinel" + sentinel "github.com/beego/beego/v2/server/web/session/redis_sentinel" ) // DefaultPoolSize redis_sentinel default pool size diff --git a/adapter/session/redis_sentinel/sess_redis_sentinel_test.go b/adapter/session/redis_sentinel/sess_redis_sentinel_test.go index 29a84597..0a6249ee 100644 --- a/adapter/session/redis_sentinel/sess_redis_sentinel_test.go +++ b/adapter/session/redis_sentinel/sess_redis_sentinel_test.go @@ -5,7 +5,7 @@ import ( "net/http/httptest" "testing" - "github.com/beego/beego/adapter/session" + "github.com/beego/beego/v2/adapter/session" ) func TestRedisSentinel(t *testing.T) { diff --git a/adapter/session/sess_cookie.go b/adapter/session/sess_cookie.go index 404b9913..ef3b6799 100644 --- a/adapter/session/sess_cookie.go +++ b/adapter/session/sess_cookie.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) // CookieSessionStore Cookie SessionStore diff --git a/adapter/session/sess_file.go b/adapter/session/sess_file.go index 8b6f3c4a..c201cf74 100644 --- a/adapter/session/sess_file.go +++ b/adapter/session/sess_file.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) // FileSessionStore File session store diff --git a/adapter/session/sess_mem.go b/adapter/session/sess_mem.go index 932f7a81..6a4e62c6 100644 --- a/adapter/session/sess_mem.go +++ b/adapter/session/sess_mem.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) // MemSessionStore memory session store. diff --git a/adapter/session/sess_utils.go b/adapter/session/sess_utils.go index 319eaad8..2fe229d7 100644 --- a/adapter/session/sess_utils.go +++ b/adapter/session/sess_utils.go @@ -15,7 +15,7 @@ package session import ( - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) // EncodeGob encode the obj to gob diff --git a/adapter/session/session.go b/adapter/session/session.go index 162bb98f..40e947fd 100644 --- a/adapter/session/session.go +++ b/adapter/session/session.go @@ -16,7 +16,7 @@ // // Usage: // import( -// "github.com/beego/beego/session" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -32,7 +32,7 @@ import ( "net/http" "os" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) // Store contains all data for one session process with specific id. diff --git a/adapter/session/ssdb/sess_ssdb.go b/adapter/session/ssdb/sess_ssdb.go index d7d812bd..73ead908 100644 --- a/adapter/session/ssdb/sess_ssdb.go +++ b/adapter/session/ssdb/sess_ssdb.go @@ -4,9 +4,9 @@ import ( "context" "net/http" - "github.com/beego/beego/adapter/session" + "github.com/beego/beego/v2/adapter/session" - beeSsdb "github.com/beego/beego/server/web/session/ssdb" + beeSsdb "github.com/beego/beego/v2/server/web/session/ssdb" ) // Provider holds ssdb client and configs diff --git a/adapter/session/store_adapter.go b/adapter/session/store_adapter.go index f0db560f..a459e68c 100644 --- a/adapter/session/store_adapter.go +++ b/adapter/session/store_adapter.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) type NewToOldStoreAdapter struct { diff --git a/adapter/swagger/swagger.go b/adapter/swagger/swagger.go index 2b28a791..fbb00bb4 100644 --- a/adapter/swagger/swagger.go +++ b/adapter/swagger/swagger.go @@ -21,7 +21,7 @@ package swagger import ( - "github.com/beego/beego/server/web/swagger" + "github.com/beego/beego/v2/server/web/swagger" ) // Swagger list the resource diff --git a/adapter/template.go b/adapter/template.go index 249688cc..5957a0eb 100644 --- a/adapter/template.go +++ b/adapter/template.go @@ -19,7 +19,7 @@ import ( "io" "net/http" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/server/web" ) // ExecuteTemplate applies the template with name to the specified data object, diff --git a/adapter/templatefunc.go b/adapter/templatefunc.go index f4876a2b..808539e7 100644 --- a/adapter/templatefunc.go +++ b/adapter/templatefunc.go @@ -19,7 +19,7 @@ import ( "net/url" "time" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/server/web" ) const ( diff --git a/adapter/testing/client.go b/adapter/testing/client.go index bf72d04b..356a0f68 100644 --- a/adapter/testing/client.go +++ b/adapter/testing/client.go @@ -15,7 +15,7 @@ package testing import ( - "github.com/beego/beego/client/httplib/testing" + "github.com/beego/beego/v2/client/httplib/testing" ) var port = "" diff --git a/adapter/toolbox/healthcheck.go b/adapter/toolbox/healthcheck.go index 1c690407..9095053f 100644 --- a/adapter/toolbox/healthcheck.go +++ b/adapter/toolbox/healthcheck.go @@ -31,7 +31,7 @@ package toolbox import ( - "github.com/beego/beego/core/admin" + "github.com/beego/beego/v2/core/admin" ) // AdminCheckList holds health checker map diff --git a/adapter/toolbox/profile.go b/adapter/toolbox/profile.go index 1b8fa3dc..15d7010a 100644 --- a/adapter/toolbox/profile.go +++ b/adapter/toolbox/profile.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/beego/beego/core/admin" + "github.com/beego/beego/v2/core/admin" ) var startTime = time.Now() diff --git a/adapter/toolbox/statistics.go b/adapter/toolbox/statistics.go index 4d7ba6a1..47bfbbd5 100644 --- a/adapter/toolbox/statistics.go +++ b/adapter/toolbox/statistics.go @@ -17,7 +17,7 @@ package toolbox import ( "time" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/server/web" ) // Statistics struct diff --git a/adapter/toolbox/task.go b/adapter/toolbox/task.go index 2dacc17f..bdd6679f 100644 --- a/adapter/toolbox/task.go +++ b/adapter/toolbox/task.go @@ -19,7 +19,7 @@ import ( "sort" "time" - "github.com/beego/beego/task" + "github.com/beego/beego/v2/task" ) // The bounds for each field. diff --git a/adapter/tree.go b/adapter/tree.go index e3ac3854..fe9f6933 100644 --- a/adapter/tree.go +++ b/adapter/tree.go @@ -15,10 +15,10 @@ package adapter import ( - "github.com/beego/beego/adapter/context" - beecontext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/adapter/context" + beecontext "github.com/beego/beego/v2/server/web/context" - "github.com/beego/beego/server/web" + "github.com/beego/beego/v2/server/web" ) // Tree has three elements: FixRouter/wildcard/leaves diff --git a/adapter/utils/caller.go b/adapter/utils/caller.go index 6f8514a6..7aec5000 100644 --- a/adapter/utils/caller.go +++ b/adapter/utils/caller.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // GetFuncName get function name diff --git a/adapter/utils/captcha/README.md b/adapter/utils/captcha/README.md index 9dd603ac..74e1cf82 100644 --- a/adapter/utils/captcha/README.md +++ b/adapter/utils/captcha/README.md @@ -6,9 +6,9 @@ an example for use captcha package controllers import ( - "github.com/beego/beego" - "github.com/beego/beego/cache" - "github.com/beego/beego/utils/captcha" + "github.com/beego/beego/v2" + "github.com/beego/beego/v2/cache" + "github.com/beego/beego/v2/utils/captcha" ) var cpt *captcha.Captcha diff --git a/adapter/utils/captcha/captcha.go b/adapter/utils/captcha/captcha.go index 39071639..4f5dd867 100644 --- a/adapter/utils/captcha/captcha.go +++ b/adapter/utils/captcha/captcha.go @@ -19,9 +19,9 @@ // package controllers // // import ( -// "github.com/beego/beego" -// "github.com/beego/beego/cache" -// "github.com/beego/beego/utils/captcha" +// "github.com/beego/beego/v2" +// "github.com/beego/beego/v2/cache" +// "github.com/beego/beego/v2/utils/captcha" // ) // // var cpt *captcha.Captcha @@ -63,11 +63,11 @@ import ( "net/http" "time" - "github.com/beego/beego/server/web/captcha" - beecontext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/captcha" + beecontext "github.com/beego/beego/v2/server/web/context" - "github.com/beego/beego/adapter/cache" - "github.com/beego/beego/adapter/context" + "github.com/beego/beego/v2/adapter/cache" + "github.com/beego/beego/v2/adapter/context" ) var ( diff --git a/adapter/utils/captcha/image.go b/adapter/utils/captcha/image.go index 542089b7..c28beb3c 100644 --- a/adapter/utils/captcha/image.go +++ b/adapter/utils/captcha/image.go @@ -17,7 +17,7 @@ package captcha import ( "io" - "github.com/beego/beego/server/web/captcha" + "github.com/beego/beego/v2/server/web/captcha" ) // Image struct diff --git a/adapter/utils/captcha/image_test.go b/adapter/utils/captcha/image_test.go index 2a46b58a..8e3b1306 100644 --- a/adapter/utils/captcha/image_test.go +++ b/adapter/utils/captcha/image_test.go @@ -17,7 +17,7 @@ package captcha import ( "testing" - "github.com/beego/beego/adapter/utils" + "github.com/beego/beego/v2/adapter/utils" ) const ( diff --git a/adapter/utils/debug.go b/adapter/utils/debug.go index 5159a177..3e4e3a27 100644 --- a/adapter/utils/debug.go +++ b/adapter/utils/debug.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // Display print the data in console diff --git a/adapter/utils/file.go b/adapter/utils/file.go index 6ed1b776..e6a785a2 100644 --- a/adapter/utils/file.go +++ b/adapter/utils/file.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // SelfPath gets compiled executable file absolute path diff --git a/adapter/utils/mail.go b/adapter/utils/mail.go index 5c23ad8b..4ef89660 100644 --- a/adapter/utils/mail.go +++ b/adapter/utils/mail.go @@ -17,7 +17,7 @@ package utils import ( "io" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // Email is the type used for email messages diff --git a/adapter/utils/pagination/controller.go b/adapter/utils/pagination/controller.go index 4409d56f..ab3fb83d 100644 --- a/adapter/utils/pagination/controller.go +++ b/adapter/utils/pagination/controller.go @@ -15,9 +15,9 @@ package pagination import ( - "github.com/beego/beego/adapter/context" - beecontext "github.com/beego/beego/server/web/context" - "github.com/beego/beego/server/web/pagination" + "github.com/beego/beego/v2/adapter/context" + beecontext "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/pagination" ) // SetPaginator Instantiates a Paginator and assigns it to context.Input.Data("paginator"). diff --git a/adapter/utils/pagination/doc.go b/adapter/utils/pagination/doc.go index d5d001a3..d180b093 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/utils/pagination" + import "github.com/beego/beego/v2/utils/pagination" type PostsController struct { beego.Controller diff --git a/adapter/utils/pagination/paginator.go b/adapter/utils/pagination/paginator.go index 8b1bf3bf..cbf71da4 100644 --- a/adapter/utils/pagination/paginator.go +++ b/adapter/utils/pagination/paginator.go @@ -17,7 +17,7 @@ package pagination import ( "net/http" - "github.com/beego/beego/core/utils/pagination" + "github.com/beego/beego/v2/core/utils/pagination" ) // Paginator within the state of a http request. diff --git a/adapter/utils/rand.go b/adapter/utils/rand.go index 42041edb..2c22ac76 100644 --- a/adapter/utils/rand.go +++ b/adapter/utils/rand.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // RandomCreateBytes generate random []byte by specify chars. diff --git a/adapter/utils/safemap.go b/adapter/utils/safemap.go index 8b49d092..62bf811b 100644 --- a/adapter/utils/safemap.go +++ b/adapter/utils/safemap.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // BeeMap is a map with lock diff --git a/adapter/utils/slice.go b/adapter/utils/slice.go index 05323890..cdbfcca8 100644 --- a/adapter/utils/slice.go +++ b/adapter/utils/slice.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) type reducetype func(interface{}) interface{} diff --git a/adapter/utils/utils.go b/adapter/utils/utils.go index 58c47da3..235cc352 100644 --- a/adapter/utils/utils.go +++ b/adapter/utils/utils.go @@ -1,7 +1,7 @@ package utils import ( - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // GetGOPATHs returns all paths in GOPATH variable. diff --git a/adapter/validation/util.go b/adapter/validation/util.go index 81ff5c9f..502be750 100644 --- a/adapter/validation/util.go +++ b/adapter/validation/util.go @@ -17,7 +17,7 @@ package validation import ( "reflect" - "github.com/beego/beego/core/validation" + "github.com/beego/beego/v2/core/validation" ) const ( diff --git a/adapter/validation/validation.go b/adapter/validation/validation.go index 2184e229..8226fa20 100644 --- a/adapter/validation/validation.go +++ b/adapter/validation/validation.go @@ -15,7 +15,7 @@ // Package validation for validations // // import ( -// "github.com/beego/beego/validation" +// "github.com/beego/beego/v2/validation" // "log" // ) // @@ -50,7 +50,7 @@ import ( "fmt" "regexp" - "github.com/beego/beego/core/validation" + "github.com/beego/beego/v2/core/validation" ) // ValidFormer valid interface diff --git a/adapter/validation/validators.go b/adapter/validation/validators.go index e325bf4e..f4d7db3b 100644 --- a/adapter/validation/validators.go +++ b/adapter/validation/validators.go @@ -17,7 +17,7 @@ package validation import ( "sync" - "github.com/beego/beego/core/validation" + "github.com/beego/beego/v2/core/validation" ) // CanSkipFuncs will skip valid if RequiredFirst is true and the struct field's value is empty diff --git a/client/cache/README.md b/client/cache/README.md index 1c037c87..fa7b5363 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/cache + go get github.com/beego/beego/v2/cache ## What adapters are supported? @@ -17,7 +17,7 @@ As of now this cache support memory, Memcache and Redis. First you must import it import ( - "github.com/beego/beego/cache" + "github.com/beego/beego/v2/cache" ) Then init a Cache (example with memory adapter) diff --git a/client/cache/cache.go b/client/cache/cache.go index d241e517..e73a1c1a 100644 --- a/client/cache/cache.go +++ b/client/cache/cache.go @@ -16,7 +16,7 @@ // Usage: // // import( -// "github.com/beego/beego/cache" +// "github.com/beego/beego/v2/cache" // ) // // bm, err := cache.NewCache("memory", `{"interval":60}`) diff --git a/client/cache/memcache/memcache.go b/client/cache/memcache/memcache.go index dcc5b017..527d08ca 100644 --- a/client/cache/memcache/memcache.go +++ b/client/cache/memcache/memcache.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/beego/beego/cache/memcache" -// "github.com/beego/beego/cache" +// _ "github.com/beego/beego/v2/cache/memcache" +// "github.com/beego/beego/v2/cache" // ) // // bm, err := cache.NewCache("memcache", `{"conn":"127.0.0.1:11211"}`) @@ -39,7 +39,7 @@ import ( "github.com/bradfitz/gomemcache/memcache" - "github.com/beego/beego/client/cache" + "github.com/beego/beego/v2/client/cache" ) // Cache Memcache adapter. diff --git a/client/cache/memcache/memcache_test.go b/client/cache/memcache/memcache_test.go index 988501aa..083e661c 100644 --- a/client/cache/memcache/memcache_test.go +++ b/client/cache/memcache/memcache_test.go @@ -24,7 +24,7 @@ import ( _ "github.com/bradfitz/gomemcache/memcache" - "github.com/beego/beego/client/cache" + "github.com/beego/beego/v2/client/cache" ) func TestMemcacheCache(t *testing.T) { diff --git a/client/cache/redis/redis.go b/client/cache/redis/redis.go index c2817720..dcf0cd5a 100644 --- a/client/cache/redis/redis.go +++ b/client/cache/redis/redis.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/beego/beego/cache/redis" -// "github.com/beego/beego/cache" +// _ "github.com/beego/beego/v2/cache/redis" +// "github.com/beego/beego/v2/cache" // ) // // bm, err := cache.NewCache("redis", `{"conn":"127.0.0.1:11211"}`) @@ -40,7 +40,7 @@ import ( "github.com/gomodule/redigo/redis" - "github.com/beego/beego/client/cache" + "github.com/beego/beego/v2/client/cache" ) var ( diff --git a/client/cache/redis/redis_test.go b/client/cache/redis/redis_test.go index 30613842..3344bc34 100644 --- a/client/cache/redis/redis_test.go +++ b/client/cache/redis/redis_test.go @@ -24,7 +24,7 @@ import ( "github.com/gomodule/redigo/redis" "github.com/stretchr/testify/assert" - "github.com/beego/beego/client/cache" + "github.com/beego/beego/v2/client/cache" ) func TestRedisCache(t *testing.T) { diff --git a/client/cache/ssdb/ssdb.go b/client/cache/ssdb/ssdb.go index 0bd92d4a..a4ec4590 100644 --- a/client/cache/ssdb/ssdb.go +++ b/client/cache/ssdb/ssdb.go @@ -11,7 +11,7 @@ import ( "github.com/ssdb/gossdb/ssdb" - "github.com/beego/beego/client/cache" + "github.com/beego/beego/v2/client/cache" ) // Cache SSDB adapter diff --git a/client/cache/ssdb/ssdb_test.go b/client/cache/ssdb/ssdb_test.go index 8fe9e2cf..8ac1efd6 100644 --- a/client/cache/ssdb/ssdb_test.go +++ b/client/cache/ssdb/ssdb_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/beego/beego/client/cache" + "github.com/beego/beego/v2/client/cache" ) func TestSsdbcacheCache(t *testing.T) { diff --git a/client/httplib/README.md b/client/httplib/README.md index 3a3042da..95c10049 100644 --- a/client/httplib/README.md +++ b/client/httplib/README.md @@ -6,7 +6,7 @@ httplib is an libs help you to curl remote url. ## GET you can use Get to crawl data. - import "github.com/beego/beego/httplib" + import "github.com/beego/beego/v2/httplib" str, err := httplib.Get("http://beego.me/").String() if err != nil { @@ -94,4 +94,4 @@ httplib support mutil file upload, use `req.PostFile()` See godoc for further documentation and examples. -* [godoc.org/github.com/beego/beego/httplib](https://godoc.org/github.com/beego/beego/httplib) +* [godoc.org/github.com/beego/beego/v2/httplib](https://godoc.org/github.com/beego/beego/v2/httplib) diff --git a/client/httplib/filter/opentracing/filter.go b/client/httplib/filter/opentracing/filter.go index 585419a3..88d798bc 100644 --- a/client/httplib/filter/opentracing/filter.go +++ b/client/httplib/filter/opentracing/filter.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/beego/beego/client/httplib" + "github.com/beego/beego/v2/client/httplib" logKit "github.com/go-kit/kit/log" opentracingKit "github.com/go-kit/kit/tracing/opentracing" "github.com/opentracing/opentracing-go" diff --git a/client/httplib/filter/opentracing/filter_test.go b/client/httplib/filter/opentracing/filter_test.go index 30374814..b9c1e1e2 100644 --- a/client/httplib/filter/opentracing/filter_test.go +++ b/client/httplib/filter/opentracing/filter_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/client/httplib" + "github.com/beego/beego/v2/client/httplib" ) func TestFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/client/httplib/filter/prometheus/filter.go b/client/httplib/filter/prometheus/filter.go index b28c2e5c..a4de521b 100644 --- a/client/httplib/filter/prometheus/filter.go +++ b/client/httplib/filter/prometheus/filter.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/beego/beego/client/httplib" + "github.com/beego/beego/v2/client/httplib" ) type FilterChainBuilder struct { diff --git a/client/httplib/filter/prometheus/filter_test.go b/client/httplib/filter/prometheus/filter_test.go index 091d2ee9..1e7935d0 100644 --- a/client/httplib/filter/prometheus/filter_test.go +++ b/client/httplib/filter/prometheus/filter_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/client/httplib" + "github.com/beego/beego/v2/client/httplib" ) func TestFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/client/httplib/httplib.go b/client/httplib/httplib.go index 86a6bab5..3ffd3fbe 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/httplib" +// import "github.com/beego/beego/v2/httplib" // // b := httplib.Post("http://beego.me/") // b.Param("username","astaxie") diff --git a/client/httplib/testing/client.go b/client/httplib/testing/client.go index db5f69e1..517e0722 100644 --- a/client/httplib/testing/client.go +++ b/client/httplib/testing/client.go @@ -15,7 +15,7 @@ package testing import ( - "github.com/beego/beego/client/httplib" + "github.com/beego/beego/v2/client/httplib" ) var port = "" diff --git a/client/orm/README.md b/client/orm/README.md index d3ef8362..58669e1f 100644 --- a/client/orm/README.md +++ b/client/orm/README.md @@ -1,6 +1,6 @@ # beego orm -[![Build Status](https://drone.io/github.com/beego/beego/status.png)](https://drone.io/github.com/beego/beego/latest) +[![Build Status](https://drone.io/github.com/beego/beego/v2/status.png)](https://drone.io/github.com/beego/beego/v2/latest) A powerful orm framework for go. @@ -27,7 +27,7 @@ more features please read the docs **Install:** - go get github.com/beego/beego/orm + go get github.com/beego/beego/v2/orm ## Changelog @@ -45,7 +45,7 @@ package main import ( "fmt" - "github.com/beego/beego/orm" + "github.com/beego/beego/v2/orm" _ "github.com/go-sql-driver/mysql" // import your used driver ) diff --git a/client/orm/db.go b/client/orm/db.go index 651c778b..9af4bb80 100644 --- a/client/orm/db.go +++ b/client/orm/db.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/beego/beego/client/orm/hints" + "github.com/beego/beego/v2/client/orm/hints" ) const ( diff --git a/client/orm/db_oracle.go b/client/orm/db_oracle.go index da693bab..00b9c750 100644 --- a/client/orm/db_oracle.go +++ b/client/orm/db_oracle.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/beego/beego/client/orm/hints" + "github.com/beego/beego/v2/client/orm/hints" ) // oracle operators. diff --git a/client/orm/db_sqlite.go b/client/orm/db_sqlite.go index a14b0e20..aff713a5 100644 --- a/client/orm/db_sqlite.go +++ b/client/orm/db_sqlite.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/beego/beego/client/orm/hints" + "github.com/beego/beego/v2/client/orm/hints" ) // sqlite operators. diff --git a/client/orm/do_nothing_orm.go b/client/orm/do_nothing_orm.go index 13e5734c..c6da420d 100644 --- a/client/orm/do_nothing_orm.go +++ b/client/orm/do_nothing_orm.go @@ -18,7 +18,7 @@ import ( "context" "database/sql" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // DoNothingOrm won't do anything, usually you use this to custom your mock Ormer implementation diff --git a/client/orm/filter/bean/default_value_filter.go b/client/orm/filter/bean/default_value_filter.go index 5b90cfd9..b71903b3 100644 --- a/client/orm/filter/bean/default_value_filter.go +++ b/client/orm/filter/bean/default_value_filter.go @@ -19,10 +19,10 @@ import ( "reflect" "strings" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/client/orm" - "github.com/beego/beego/core/bean" + "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/bean" ) // DefaultValueFilterChainBuilder only works for InsertXXX method, diff --git a/client/orm/filter/bean/default_value_filter_test.go b/client/orm/filter/bean/default_value_filter_test.go index 60ecb346..871d5539 100644 --- a/client/orm/filter/bean/default_value_filter_test.go +++ b/client/orm/filter/bean/default_value_filter_test.go @@ -19,7 +19,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) func TestDefaultValueFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/client/orm/filter/opentracing/filter.go b/client/orm/filter/opentracing/filter.go index 9079ccc5..75852c63 100644 --- a/client/orm/filter/opentracing/filter.go +++ b/client/orm/filter/opentracing/filter.go @@ -20,7 +20,7 @@ import ( "github.com/opentracing/opentracing-go" - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // FilterChainBuilder provides an extension point diff --git a/client/orm/filter/opentracing/filter_test.go b/client/orm/filter/opentracing/filter_test.go index d4a8b551..d6ee1fd8 100644 --- a/client/orm/filter/opentracing/filter_test.go +++ b/client/orm/filter/opentracing/filter_test.go @@ -21,7 +21,7 @@ import ( "github.com/opentracing/opentracing-go" - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) func TestFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/client/orm/filter/prometheus/filter.go b/client/orm/filter/prometheus/filter.go index 5e950b38..1f30f770 100644 --- a/client/orm/filter/prometheus/filter.go +++ b/client/orm/filter/prometheus/filter.go @@ -22,7 +22,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) // FilterChainBuilder is an extension point, diff --git a/client/orm/filter/prometheus/filter_test.go b/client/orm/filter/prometheus/filter_test.go index ddd5d33b..92316557 100644 --- a/client/orm/filter/prometheus/filter_test.go +++ b/client/orm/filter/prometheus/filter_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/client/orm" + "github.com/beego/beego/v2/client/orm" ) func TestFilterChainBuilder_FilterChain1(t *testing.T) { diff --git a/client/orm/filter_orm_decorator.go b/client/orm/filter_orm_decorator.go index 98fb23d2..a60390a1 100644 --- a/client/orm/filter_orm_decorator.go +++ b/client/orm/filter_orm_decorator.go @@ -20,7 +20,7 @@ import ( "reflect" "time" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) const ( diff --git a/client/orm/filter_orm_decorator_test.go b/client/orm/filter_orm_decorator_test.go index f3fb8167..b97dc664 100644 --- a/client/orm/filter_orm_decorator_test.go +++ b/client/orm/filter_orm_decorator_test.go @@ -21,7 +21,7 @@ import ( "sync" "testing" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" "github.com/stretchr/testify/assert" ) diff --git a/client/orm/hints/db_hints.go b/client/orm/hints/db_hints.go index 9aad7676..3a333815 100644 --- a/client/orm/hints/db_hints.go +++ b/client/orm/hints/db_hints.go @@ -15,7 +15,7 @@ package hints import ( - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) const ( diff --git a/client/orm/migration/ddl.go b/client/orm/migration/ddl.go index ca670e0b..ec6dc2e7 100644 --- a/client/orm/migration/ddl.go +++ b/client/orm/migration/ddl.go @@ -17,7 +17,7 @@ package migration import ( "fmt" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) // Index struct defines the structure of Index Columns diff --git a/client/orm/migration/migration.go b/client/orm/migration/migration.go index 924d7afd..9274018f 100644 --- a/client/orm/migration/migration.go +++ b/client/orm/migration/migration.go @@ -33,8 +33,8 @@ import ( "strings" "time" - "github.com/beego/beego/client/orm" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/client/orm" + "github.com/beego/beego/v2/core/logs" ) // const the data format for the bee generate migration datatype diff --git a/client/orm/models_info_f.go b/client/orm/models_info_f.go index d64d48d5..c7ad4801 100644 --- a/client/orm/models_info_f.go +++ b/client/orm/models_info_f.go @@ -194,7 +194,7 @@ checkType: } fieldType = f.FieldType() if fieldType&IsRelField > 0 { - err = fmt.Errorf("unsupport type custom field, please refer to https://github.com/beego/beego/blob/master/orm/models_fields.go#L24-L42") + err = fmt.Errorf("unsupport type custom field, please refer to https://github.com/beego/beego/v2/blob/master/orm/models_fields.go#L24-L42") goto end } default: diff --git a/client/orm/models_test.go b/client/orm/models_test.go index be6d9c26..e3f74c0b 100644 --- a/client/orm/models_test.go +++ b/client/orm/models_test.go @@ -318,7 +318,7 @@ type Post struct { Created time.Time `orm:"auto_now_add"` Updated time.Time `orm:"auto_now"` UpdatedPrecision time.Time `orm:"auto_now;type(datetime);precision(4)"` - Tags []*Tag `orm:"rel(m2m);rel_through(github.com/beego/beego/client/orm.PostTags)"` + Tags []*Tag `orm:"rel(m2m);rel_through(github.com/beego/beego/v2/client/orm.PostTags)"` } func (u *Post) TableIndex() [][]string { @@ -376,7 +376,7 @@ type Group struct { type Permission struct { ID int `orm:"column(id)"` Name string - Groups []*Group `orm:"rel(m2m);rel_through(github.com/beego/beego/client/orm.GroupPermissions)"` + Groups []*Group `orm:"rel(m2m);rel_through(github.com/beego/beego/v2/client/orm.GroupPermissions)"` } type GroupPermissions struct { @@ -485,7 +485,7 @@ var ( usage: - go get -u github.com/beego/beego/client/orm + go get -u github.com/beego/beego/v2/client/orm go get -u github.com/go-sql-driver/mysql go get -u github.com/mattn/go-sqlite3 go get -u github.com/lib/pq @@ -495,25 +495,25 @@ var ( mysql -u root -e 'create database orm_test;' export ORM_DRIVER=mysql export ORM_SOURCE="root:@/orm_test?charset=utf8" - go test -v github.com/beego/beego/client/orm + go test -v github.com/beego/beego/v2/client/orm #### Sqlite3 export ORM_DRIVER=sqlite3 export ORM_SOURCE='file:memory_test?mode=memory' - go test -v github.com/beego/beego/client/orm + go test -v github.com/beego/beego/v2/client/orm #### PostgreSQL psql -c 'create database orm_test;' -U postgres export ORM_DRIVER=postgres export ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable" - go test -v github.com/beego/beego/client/orm + go test -v github.com/beego/beego/v2/client/orm #### TiDB export ORM_DRIVER=tidb export ORM_SOURCE='memory://test/test' - go test -v github.com/beego/beego/pgk/orm + go test -v github.com/beego/beego/v2/pgk/orm ` ) diff --git a/client/orm/orm.go b/client/orm/orm.go index f018b06c..1adf84e2 100644 --- a/client/orm/orm.go +++ b/client/orm/orm.go @@ -21,7 +21,7 @@ // // import ( // "fmt" -// "github.com/beego/beego/client/orm" +// "github.com/beego/beego/v2/client/orm" // _ "github.com/go-sql-driver/mysql" // import your used driver // ) // @@ -62,10 +62,10 @@ import ( "reflect" "time" - "github.com/beego/beego/client/orm/hints" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/client/orm/hints" + "github.com/beego/beego/v2/core/utils" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) // DebugQueries define the debug diff --git a/client/orm/orm_queryset.go b/client/orm/orm_queryset.go index e3fed428..177cfc3a 100644 --- a/client/orm/orm_queryset.go +++ b/client/orm/orm_queryset.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/beego/beego/client/orm/hints" + "github.com/beego/beego/v2/client/orm/hints" ) type colValue struct { diff --git a/client/orm/orm_test.go b/client/orm/orm_test.go index f4d477b1..43ee8666 100644 --- a/client/orm/orm_test.go +++ b/client/orm/orm_test.go @@ -31,7 +31,7 @@ import ( "testing" "time" - "github.com/beego/beego/client/orm/hints" + "github.com/beego/beego/v2/client/orm/hints" "github.com/stretchr/testify/assert" ) diff --git a/client/orm/types.go b/client/orm/types.go index ae9c4086..02ca4648 100644 --- a/client/orm/types.go +++ b/client/orm/types.go @@ -20,7 +20,7 @@ import ( "reflect" "time" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // TableNaming is usually used by model diff --git a/core/admin/profile.go b/core/admin/profile.go index 1c124cac..5b3fdb21 100644 --- a/core/admin/profile.go +++ b/core/admin/profile.go @@ -26,7 +26,7 @@ import ( "strconv" "time" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) var startTime = time.Now() diff --git a/core/bean/tag_auto_wire_bean_factory.go b/core/bean/tag_auto_wire_bean_factory.go index a0d56867..821eed26 100644 --- a/core/bean/tag_auto_wire_bean_factory.go +++ b/core/bean/tag_auto_wire_bean_factory.go @@ -22,7 +22,7 @@ import ( "github.com/pkg/errors" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) const DefaultValueTagKey = "default" diff --git a/core/config/config.go b/core/config/config.go index e5471b4a..d0add317 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/config" +// import "github.com/beego/beego/v2/config" // Examples. // // cnf, err := config.NewConfig("ini", "config.conf") diff --git a/core/config/env/env.go b/core/config/env/env.go index 171f9c20..fbf06c5d 100644 --- a/core/config/env/env.go +++ b/core/config/env/env.go @@ -21,7 +21,7 @@ import ( "os" "strings" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) var env *utils.BeeMap diff --git a/core/config/etcd/config.go b/core/config/etcd/config.go index 57a33b0d..acc43f35 100644 --- a/core/config/etcd/config.go +++ b/core/config/etcd/config.go @@ -26,8 +26,8 @@ import ( "github.com/pkg/errors" "google.golang.org/grpc" - "github.com/beego/beego/core/config" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/config" + "github.com/beego/beego/v2/core/logs" ) type EtcdConfiger struct { diff --git a/core/config/global.go b/core/config/global.go index 91571b21..d0b74253 100644 --- a/core/config/global.go +++ b/core/config/global.go @@ -20,7 +20,7 @@ var globalInstance Configer // InitGlobalInstance will ini the global instance // If you want to use specific implementation, don't forget to import it. -// e.g. _ import "github.com/beego/beego/core/config/etcd" +// e.g. _ import "github.com/beego/beego/v2/core/config/etcd" // err := InitGlobalInstance("etcd", "someconfig") func InitGlobalInstance(name string, cfg string) error { var err error diff --git a/core/config/ini.go b/core/config/ini.go index 03e1cc89..f2877ce8 100644 --- a/core/config/ini.go +++ b/core/config/ini.go @@ -30,7 +30,7 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) var ( diff --git a/core/config/json/json.go b/core/config/json/json.go index 455952fb..c1a29cad 100644 --- a/core/config/json/json.go +++ b/core/config/json/json.go @@ -26,8 +26,8 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/beego/beego/core/config" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/config" + "github.com/beego/beego/v2/core/logs" ) // JSONConfig is a json config parser and implements Config interface. diff --git a/core/config/json/json_test.go b/core/config/json/json_test.go index 4e9b1e60..8f5b2c83 100644 --- a/core/config/json/json_test.go +++ b/core/config/json/json_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/core/config" + "github.com/beego/beego/v2/core/config" ) func TestJsonStartsWithArray(t *testing.T) { diff --git a/core/config/toml/toml.go b/core/config/toml/toml.go index e0c6ed2c..9261cd27 100644 --- a/core/config/toml/toml.go +++ b/core/config/toml/toml.go @@ -21,7 +21,7 @@ import ( "github.com/pelletier/go-toml" - "github.com/beego/beego/core/config" + "github.com/beego/beego/v2/core/config" ) const keySeparator = "." diff --git a/core/config/toml/toml_test.go b/core/config/toml/toml_test.go index 629cbeb4..2867f4be 100644 --- a/core/config/toml/toml_test.go +++ b/core/config/toml/toml_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/core/config" + "github.com/beego/beego/v2/core/config" ) func TestConfig_Parse(t *testing.T) { diff --git a/core/config/xml/xml.go b/core/config/xml/xml.go index 38c9f6d3..059ada5c 100644 --- a/core/config/xml/xml.go +++ b/core/config/xml/xml.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/beego/beego/config/xml" -// "github.com/beego/beego/config" +// _ "github.com/beego/beego/v2/config/xml" +// "github.com/beego/beego/v2/config" // ) // // cnf, err := config.NewConfig("xml", "config.xml") @@ -41,8 +41,8 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/beego/beego/core/config" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/config" + "github.com/beego/beego/v2/core/logs" "github.com/beego/x2j" ) diff --git a/core/config/xml/xml_test.go b/core/config/xml/xml_test.go index 0a001891..37c5fe7f 100644 --- a/core/config/xml/xml_test.go +++ b/core/config/xml/xml_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/core/config" + "github.com/beego/beego/v2/core/config" ) func TestXML(t *testing.T) { diff --git a/core/config/yaml/yaml.go b/core/config/yaml/yaml.go index ec50c77e..778a4eb1 100644 --- a/core/config/yaml/yaml.go +++ b/core/config/yaml/yaml.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/beego/beego/config/yaml" -// "github.com/beego/beego/config" +// _ "github.com/beego/beego/v2/config/yaml" +// "github.com/beego/beego/v2/config" // ) // // cnf, err := config.NewConfig("yaml", "config.yaml") @@ -43,8 +43,8 @@ import ( "github.com/beego/goyaml2" "gopkg.in/yaml.v2" - "github.com/beego/beego/core/config" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/config" + "github.com/beego/beego/v2/core/logs" ) // Config is a yaml config parser and implements Config interface. diff --git a/core/config/yaml/yaml_test.go b/core/config/yaml/yaml_test.go index f2d60762..cf889613 100644 --- a/core/config/yaml/yaml_test.go +++ b/core/config/yaml/yaml_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/core/config" + "github.com/beego/beego/v2/core/config" ) func TestYaml(t *testing.T) { diff --git a/core/logs/README.md b/core/logs/README.md index 660b1fe1..5555be60 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/logs + go get github.com/beego/beego/v2/logs ## What adapters are supported? @@ -18,7 +18,7 @@ First you must import it ```golang import ( - "github.com/beego/beego/logs" + "github.com/beego/beego/v2/logs" ) ``` diff --git a/core/logs/alils/alils.go b/core/logs/alils/alils.go index 832d5425..7a3e4ddf 100644 --- a/core/logs/alils/alils.go +++ b/core/logs/alils/alils.go @@ -9,7 +9,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/pkg/errors" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) const ( diff --git a/core/logs/es/es.go b/core/logs/es/es.go index 6eee6eae..2e592ffd 100644 --- a/core/logs/es/es.go +++ b/core/logs/es/es.go @@ -12,7 +12,7 @@ import ( "github.com/elastic/go-elasticsearch/v6" "github.com/elastic/go-elasticsearch/v6/esapi" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) // NewES returns a LoggerInterface @@ -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/logs/es" +// import _ "github.com/beego/beego/v2/logs/es" type esLogger struct { *elasticsearch.Client DSN string `json:"dsn"` diff --git a/core/logs/es/index.go b/core/logs/es/index.go index b695ba7a..7a31eff1 100644 --- a/core/logs/es/index.go +++ b/core/logs/es/index.go @@ -17,7 +17,7 @@ package es import ( "fmt" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) // IndexNaming generate the index name diff --git a/core/logs/es/index_test.go b/core/logs/es/index_test.go index 1d820129..ce30763a 100644 --- a/core/logs/es/index_test.go +++ b/core/logs/es/index_test.go @@ -20,7 +20,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) func TestDefaultIndexNaming_IndexName(t *testing.T) { diff --git a/core/logs/log.go b/core/logs/log.go index 1cb62a52..ef9aa7f3 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/logs" +// import "github.com/beego/beego/v2/logs" // // log := NewLogger(10000) // log.SetLogger("console", "") diff --git a/core/utils/pagination/doc.go b/core/utils/pagination/doc.go index e366b225..c2df00aa 100644 --- a/core/utils/pagination/doc.go +++ b/core/utils/pagination/doc.go @@ -8,7 +8,7 @@ In your beego.Controller: package controllers - import "github.com/beego/beego/core/utils/pagination" + import "github.com/beego/beego/v2/core/utils/pagination" type PostsController struct { beego.Controller diff --git a/core/validation/README.md b/core/validation/README.md index 80085f2c..db6b28e3 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/validation + go get github.com/beego/beego/v2/validation Test: - go test github.com/beego/beego/validation + go test github.com/beego/beego/v2/validation ## Example Direct Use: import ( - "github.com/beego/beego/validation" + "github.com/beego/beego/v2/validation" "log" ) @@ -49,7 +49,7 @@ Direct Use: Struct Tag Use: import ( - "github.com/beego/beego/validation" + "github.com/beego/beego/v2/validation" ) // validation function follow with "valid" tag @@ -81,7 +81,7 @@ Struct Tag Use: Use custom function: import ( - "github.com/beego/beego/validation" + "github.com/beego/beego/v2/validation" ) type user struct { diff --git a/core/validation/validation.go b/core/validation/validation.go index 715ab2c9..473ee73d 100644 --- a/core/validation/validation.go +++ b/core/validation/validation.go @@ -15,7 +15,7 @@ // Package validation for validations // // import ( -// "github.com/beego/beego/validation" +// "github.com/beego/beego/v2/validation" // "log" // ) // diff --git a/core/validation/validators.go b/core/validation/validators.go index c7d60baf..c4ea1f51 100644 --- a/core/validation/validators.go +++ b/core/validation/validators.go @@ -23,7 +23,7 @@ import ( "time" "unicode/utf8" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) // CanSkipFuncs will skip valid if RequiredFirst is true and the struct field's value is empty diff --git a/go.mod b/go.mod index 4c6d7f41..981eb878 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ -//module github.com/beego/beego -module github.com/beego/beego +//module github.com/beego/beego/v2 +module github.com/beego/beego/v2 require ( github.com/Knetic/govaluate v3.0.0+incompatible // indirect diff --git a/server/web/admin.go b/server/web/admin.go index 4c06aa7a..89c9ddb9 100644 --- a/server/web/admin.go +++ b/server/web/admin.go @@ -20,7 +20,7 @@ import ( "reflect" "time" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" ) // BeeAdminApp is the default adminApp used by admin module. diff --git a/server/web/admin_controller.go b/server/web/admin_controller.go index a4407ba9..4114fa81 100644 --- a/server/web/admin_controller.go +++ b/server/web/admin_controller.go @@ -24,7 +24,7 @@ import ( "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/beego/beego/core/admin" + "github.com/beego/beego/v2/core/admin" ) type adminController struct { diff --git a/server/web/admin_test.go b/server/web/admin_test.go index cf8104c1..7fa0552f 100644 --- a/server/web/admin_test.go +++ b/server/web/admin_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/core/admin" + "github.com/beego/beego/v2/core/admin" ) type SampleDatabaseCheck struct { diff --git a/server/web/captcha/README.md b/server/web/captcha/README.md index 9dd603ac..74e1cf82 100644 --- a/server/web/captcha/README.md +++ b/server/web/captcha/README.md @@ -6,9 +6,9 @@ an example for use captcha package controllers import ( - "github.com/beego/beego" - "github.com/beego/beego/cache" - "github.com/beego/beego/utils/captcha" + "github.com/beego/beego/v2" + "github.com/beego/beego/v2/cache" + "github.com/beego/beego/v2/utils/captcha" ) var cpt *captcha.Captcha diff --git a/server/web/captcha/captcha.go b/server/web/captcha/captcha.go index b46eae5c..d052af13 100644 --- a/server/web/captcha/captcha.go +++ b/server/web/captcha/captcha.go @@ -19,9 +19,9 @@ // package controllers // // import ( -// "github.com/beego/beego" -// "github.com/beego/beego/cache" -// "github.com/beego/beego/utils/captcha" +// "github.com/beego/beego/v2" +// "github.com/beego/beego/v2/cache" +// "github.com/beego/beego/v2/utils/captcha" // ) // // var cpt *captcha.Captcha @@ -67,11 +67,11 @@ import ( "strings" "time" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/core/utils" - "github.com/beego/beego/server/web" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/core/utils" + "github.com/beego/beego/v2/server/web" + "github.com/beego/beego/v2/server/web/context" ) var ( diff --git a/server/web/captcha/image_test.go b/server/web/captcha/image_test.go index a65a74c5..53e89575 100644 --- a/server/web/captcha/image_test.go +++ b/server/web/captcha/image_test.go @@ -17,7 +17,7 @@ package captcha import ( "testing" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) type byteCounter struct { diff --git a/server/web/config.go b/server/web/config.go index 7032d6ba..d89c59cb 100644 --- a/server/web/config.go +++ b/server/web/config.go @@ -23,13 +23,13 @@ import ( "runtime" "strings" - "github.com/beego/beego" - "github.com/beego/beego/core/config" - "github.com/beego/beego/core/logs" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2" + "github.com/beego/beego/v2/core/config" + "github.com/beego/beego/v2/core/logs" + "github.com/beego/beego/v2/server/web/session" - "github.com/beego/beego/core/utils" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/core/utils" + "github.com/beego/beego/v2/server/web/context" ) // Config is the main struct for BConfig diff --git a/server/web/config_test.go b/server/web/config_test.go index 63ea842b..9f8f7a80 100644 --- a/server/web/config_test.go +++ b/server/web/config_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - beeJson "github.com/beego/beego/core/config/json" + beeJson "github.com/beego/beego/v2/core/config/json" ) func TestDefaults(t *testing.T) { diff --git a/server/web/context/context.go b/server/web/context/context.go index 246310eb..b28a2235 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/context" +// import "github.com/beego/beego/v2/context" // // ctx := context.Context{Request:req,ResponseWriter:rw} // @@ -35,7 +35,7 @@ import ( "strings" "time" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // Commonly used mime-types diff --git a/server/web/context/input.go b/server/web/context/input.go index b09d9895..241ef8bc 100644 --- a/server/web/context/input.go +++ b/server/web/context/input.go @@ -29,7 +29,7 @@ import ( "strings" "sync" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) // Regexes for checking the accept headers diff --git a/server/web/context/param/conv.go b/server/web/context/param/conv.go index 6ba6a075..eecb6acb 100644 --- a/server/web/context/param/conv.go +++ b/server/web/context/param/conv.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "github.com/beego/beego/core/logs" - beecontext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/core/logs" + beecontext "github.com/beego/beego/v2/server/web/context" ) // ConvertParams converts http method params to values that will be passed to the method controller as arguments diff --git a/server/web/controller.go b/server/web/controller.go index f96ad663..5983cfbd 100644 --- a/server/web/controller.go +++ b/server/web/controller.go @@ -29,10 +29,10 @@ import ( "strconv" "strings" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" - "github.com/beego/beego/server/web/context" - "github.com/beego/beego/server/web/context/param" + "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/context/param" ) var ( diff --git a/server/web/controller_test.go b/server/web/controller_test.go index 020c8335..0ecef7ca 100644 --- a/server/web/controller_test.go +++ b/server/web/controller_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) func TestGetInt(t *testing.T) { diff --git a/server/web/doc.go b/server/web/doc.go index 7e1c6966..48c21342 100644 --- a/server/web/doc.go +++ b/server/web/doc.go @@ -6,7 +6,7 @@ It is used for rapid development of RESTful APIs, web apps and backend services beego is inspired by Tornado, Sinatra and Flask with the added benefit of some Go-specific features such as interfaces and struct embedding. package main - import "github.com/beego/beego" + import "github.com/beego/beego/v2" func main() { beego.Run() diff --git a/server/web/error.go b/server/web/error.go index 14cf8919..2809e993 100644 --- a/server/web/error.go +++ b/server/web/error.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/beego/beego" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2" + "github.com/beego/beego/v2/core/utils" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) const ( diff --git a/server/web/filter.go b/server/web/filter.go index 33464f86..0baa269f 100644 --- a/server/web/filter.go +++ b/server/web/filter.go @@ -17,7 +17,7 @@ package web import ( "strings" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) // FilterChain is different from pure FilterFunc diff --git a/server/web/filter/apiauth/apiauth.go b/server/web/filter/apiauth/apiauth.go index 9b7cbdf9..9e6c30dc 100644 --- a/server/web/filter/apiauth/apiauth.go +++ b/server/web/filter/apiauth/apiauth.go @@ -16,8 +16,8 @@ // // Simple Usage: // import( -// "github.com/beego/beego" -// "github.com/beego/beego/plugins/apiauth" +// "github.com/beego/beego/v2" +// "github.com/beego/beego/v2/plugins/apiauth" // ) // // func main(){ @@ -65,8 +65,8 @@ import ( "sort" "time" - "github.com/beego/beego/server/web" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web" + "github.com/beego/beego/v2/server/web/context" ) // AppIDToAppSecret gets appsecret through appid diff --git a/server/web/filter/auth/basic.go b/server/web/filter/auth/basic.go index b0f938e4..5a01f260 100644 --- a/server/web/filter/auth/basic.go +++ b/server/web/filter/auth/basic.go @@ -15,8 +15,8 @@ // Package auth provides handlers to enable basic auth support. // Simple Usage: // import( -// "github.com/beego/beego" -// "github.com/beego/beego/plugins/auth" +// "github.com/beego/beego/v2" +// "github.com/beego/beego/v2/plugins/auth" // ) // // func main(){ @@ -40,8 +40,8 @@ import ( "net/http" "strings" - "github.com/beego/beego/server/web" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web" + "github.com/beego/beego/v2/server/web/context" ) var defaultRealm = "Authorization Required" diff --git a/server/web/filter/authz/authz.go b/server/web/filter/authz/authz.go index 9c4495b8..8009c976 100644 --- a/server/web/filter/authz/authz.go +++ b/server/web/filter/authz/authz.go @@ -15,8 +15,8 @@ // Package authz provides handlers to enable ACL, RBAC, ABAC authorization support. // Simple Usage: // import( -// "github.com/beego/beego" -// "github.com/beego/beego/plugins/authz" +// "github.com/beego/beego/v2" +// "github.com/beego/beego/v2/plugins/authz" // "github.com/casbin/casbin" // ) // @@ -44,8 +44,8 @@ import ( "github.com/casbin/casbin" - "github.com/beego/beego/server/web" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web" + "github.com/beego/beego/v2/server/web/context" ) // NewAuthorizer returns the authorizer. diff --git a/server/web/filter/authz/authz_test.go b/server/web/filter/authz/authz_test.go index b2500fab..37153954 100644 --- a/server/web/filter/authz/authz_test.go +++ b/server/web/filter/authz/authz_test.go @@ -21,9 +21,9 @@ import ( "github.com/casbin/casbin" - "github.com/beego/beego/server/web" - "github.com/beego/beego/server/web/context" - "github.com/beego/beego/server/web/filter/auth" + "github.com/beego/beego/v2/server/web" + "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/filter/auth" ) func testRequest(t *testing.T, handler *web.ControllerRegister, user string, path string, method string, code int) { diff --git a/server/web/filter/cors/cors.go b/server/web/filter/cors/cors.go index a5a062c0..0eb9aa30 100644 --- a/server/web/filter/cors/cors.go +++ b/server/web/filter/cors/cors.go @@ -15,8 +15,8 @@ // Package cors provides handlers to enable CORS support. // Usage // import ( -// "github.com/beego/beego" -// "github.com/beego/beego/plugins/cors" +// "github.com/beego/beego/v2" +// "github.com/beego/beego/v2/plugins/cors" // ) // // func main() { @@ -42,8 +42,8 @@ import ( "strings" "time" - "github.com/beego/beego/server/web" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web" + "github.com/beego/beego/v2/server/web/context" ) const ( diff --git a/server/web/filter/cors/cors_test.go b/server/web/filter/cors/cors_test.go index ea797770..e907a202 100644 --- a/server/web/filter/cors/cors_test.go +++ b/server/web/filter/cors/cors_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/beego/beego/server/web" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web" + "github.com/beego/beego/v2/server/web/context" ) // HTTPHeaderGuardRecorder is httptest.ResponseRecorder with own http.Header diff --git a/server/web/filter/opentracing/filter.go b/server/web/filter/opentracing/filter.go index a76be7d2..a6588379 100644 --- a/server/web/filter/opentracing/filter.go +++ b/server/web/filter/opentracing/filter.go @@ -17,8 +17,8 @@ package opentracing import ( "context" - "github.com/beego/beego/server/web" - beegoCtx "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web" + beegoCtx "github.com/beego/beego/v2/server/web/context" logKit "github.com/go-kit/kit/log" opentracingKit "github.com/go-kit/kit/tracing/opentracing" "github.com/opentracing/opentracing-go" diff --git a/server/web/filter/opentracing/filter_test.go b/server/web/filter/opentracing/filter_test.go index 5064ce10..d92c98a1 100644 --- a/server/web/filter/opentracing/filter_test.go +++ b/server/web/filter/opentracing/filter_test.go @@ -22,7 +22,7 @@ import ( "github.com/opentracing/opentracing-go" "github.com/stretchr/testify/assert" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) func TestFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/server/web/filter/prometheus/filter.go b/server/web/filter/prometheus/filter.go index fe724f83..5a0db9a7 100644 --- a/server/web/filter/prometheus/filter.go +++ b/server/web/filter/prometheus/filter.go @@ -21,9 +21,9 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/beego/beego" - "github.com/beego/beego/server/web" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2" + "github.com/beego/beego/v2/server/web" + "github.com/beego/beego/v2/server/web/context" ) // FilterChainBuilder is an extension point, diff --git a/server/web/filter/prometheus/filter_test.go b/server/web/filter/prometheus/filter_test.go index 62dc23b0..f00f20e7 100644 --- a/server/web/filter/prometheus/filter_test.go +++ b/server/web/filter/prometheus/filter_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) func TestFilterChain(t *testing.T) { diff --git a/server/web/filter_chain_test.go b/server/web/filter_chain_test.go index 77918af1..2a428b78 100644 --- a/server/web/filter_chain_test.go +++ b/server/web/filter_chain_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) func TestControllerRegister_InsertFilterChain(t *testing.T) { diff --git a/server/web/filter_test.go b/server/web/filter_test.go index fa2f4328..8765243c 100644 --- a/server/web/filter_test.go +++ b/server/web/filter_test.go @@ -19,7 +19,7 @@ import ( "net/http/httptest" "testing" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) var FilterUser = func(ctx *context.Context) { diff --git a/server/web/grace/grace.go b/server/web/grace/grace.go index 3e396ea8..1da1c178 100644 --- a/server/web/grace/grace.go +++ b/server/web/grace/grace.go @@ -22,7 +22,7 @@ // "net/http" // "os" // -// "github.com/beego/beego/grace" +// "github.com/beego/beego/v2/grace" // ) // // func handler(w http.ResponseWriter, r *http.Request) { diff --git a/server/web/hooks.go b/server/web/hooks.go index 4f2b776b..6a2d725d 100644 --- a/server/web/hooks.go +++ b/server/web/hooks.go @@ -6,9 +6,9 @@ import ( "net/http" "path/filepath" - "github.com/beego/beego/core/logs" - "github.com/beego/beego/server/web/context" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/core/logs" + "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/session" ) // register MIME type with content type diff --git a/server/web/namespace.go b/server/web/namespace.go index 263323bb..1d48f02d 100644 --- a/server/web/namespace.go +++ b/server/web/namespace.go @@ -18,7 +18,7 @@ import ( "net/http" "strings" - beecontext "github.com/beego/beego/server/web/context" + beecontext "github.com/beego/beego/v2/server/web/context" ) type namespaceCond func(*beecontext.Context) bool @@ -97,91 +97,91 @@ func (n *Namespace) Filter(action string, filter ...FilterFunc) *Namespace { } // Router same as beego.Rourer -// refer: https://godoc.org/github.com/beego/beego#Router +// refer: https://godoc.org/github.com/beego/beego/v2#Router func (n *Namespace) Router(rootpath string, c ControllerInterface, mappingMethods ...string) *Namespace { n.handlers.Add(rootpath, c, mappingMethods...) return n } // AutoRouter same as beego.AutoRouter -// refer: https://godoc.org/github.com/beego/beego#AutoRouter +// refer: https://godoc.org/github.com/beego/beego/v2#AutoRouter func (n *Namespace) AutoRouter(c ControllerInterface) *Namespace { n.handlers.AddAuto(c) return n } // AutoPrefix same as beego.AutoPrefix -// refer: https://godoc.org/github.com/beego/beego#AutoPrefix +// refer: https://godoc.org/github.com/beego/beego/v2#AutoPrefix func (n *Namespace) AutoPrefix(prefix string, c ControllerInterface) *Namespace { n.handlers.AddAutoPrefix(prefix, c) return n } // Get same as beego.Get -// refer: https://godoc.org/github.com/beego/beego#Get +// refer: https://godoc.org/github.com/beego/beego/v2#Get func (n *Namespace) Get(rootpath string, f FilterFunc) *Namespace { n.handlers.Get(rootpath, f) return n } // Post same as beego.Post -// refer: https://godoc.org/github.com/beego/beego#Post +// refer: https://godoc.org/github.com/beego/beego/v2#Post func (n *Namespace) Post(rootpath string, f FilterFunc) *Namespace { n.handlers.Post(rootpath, f) return n } // Delete same as beego.Delete -// refer: https://godoc.org/github.com/beego/beego#Delete +// refer: https://godoc.org/github.com/beego/beego/v2#Delete func (n *Namespace) Delete(rootpath string, f FilterFunc) *Namespace { n.handlers.Delete(rootpath, f) return n } // Put same as beego.Put -// refer: https://godoc.org/github.com/beego/beego#Put +// refer: https://godoc.org/github.com/beego/beego/v2#Put func (n *Namespace) Put(rootpath string, f FilterFunc) *Namespace { n.handlers.Put(rootpath, f) return n } // Head same as beego.Head -// refer: https://godoc.org/github.com/beego/beego#Head +// refer: https://godoc.org/github.com/beego/beego/v2#Head func (n *Namespace) Head(rootpath string, f FilterFunc) *Namespace { n.handlers.Head(rootpath, f) return n } // Options same as beego.Options -// refer: https://godoc.org/github.com/beego/beego#Options +// refer: https://godoc.org/github.com/beego/beego/v2#Options func (n *Namespace) Options(rootpath string, f FilterFunc) *Namespace { n.handlers.Options(rootpath, f) return n } // Patch same as beego.Patch -// refer: https://godoc.org/github.com/beego/beego#Patch +// refer: https://godoc.org/github.com/beego/beego/v2#Patch func (n *Namespace) Patch(rootpath string, f FilterFunc) *Namespace { n.handlers.Patch(rootpath, f) return n } // Any same as beego.Any -// refer: https://godoc.org/github.com/beego/beego#Any +// refer: https://godoc.org/github.com/beego/beego/v2#Any func (n *Namespace) Any(rootpath string, f FilterFunc) *Namespace { n.handlers.Any(rootpath, f) return n } // Handler same as beego.Handler -// refer: https://godoc.org/github.com/beego/beego#Handler +// refer: https://godoc.org/github.com/beego/beego/v2#Handler func (n *Namespace) Handler(rootpath string, h http.Handler) *Namespace { n.handlers.Handler(rootpath, h) return n } // Include add include class -// refer: https://godoc.org/github.com/beego/beego#Include +// refer: https://godoc.org/github.com/beego/beego/v2#Include func (n *Namespace) Include(cList ...ControllerInterface) *Namespace { n.handlers.Include(cList...) return n diff --git a/server/web/namespace_test.go b/server/web/namespace_test.go index eba9bb8a..05042c96 100644 --- a/server/web/namespace_test.go +++ b/server/web/namespace_test.go @@ -20,7 +20,7 @@ import ( "strconv" "testing" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) func TestNamespaceGet(t *testing.T) { diff --git a/server/web/pagination/controller.go b/server/web/pagination/controller.go index 6b9717c0..d1299768 100644 --- a/server/web/pagination/controller.go +++ b/server/web/pagination/controller.go @@ -15,8 +15,8 @@ package pagination import ( - "github.com/beego/beego/core/utils/pagination" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/core/utils/pagination" + "github.com/beego/beego/v2/server/web/context" ) // SetPaginator Instantiates a Paginator and assigns it to context.Input.Data("paginator"). diff --git a/server/web/parser.go b/server/web/parser.go index e1ebd558..803880fe 100644 --- a/server/web/parser.go +++ b/server/web/parser.go @@ -30,17 +30,17 @@ import ( "golang.org/x/tools/go/packages" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/core/utils" - "github.com/beego/beego/server/web/context/param" + "github.com/beego/beego/v2/core/utils" + "github.com/beego/beego/v2/server/web/context/param" ) var globalRouterTemplate = `package {{.routersDir}} import ( - beego "github.com/beego/beego/server/web" - "github.com/beego/beego/server/web/context/param"{{.globalimport}} + beego "github.com/beego/beego/v2/server/web" + "github.com/beego/beego/v2/server/web/context/param"{{.globalimport}} ) func init() { diff --git a/server/web/policy.go b/server/web/policy.go index 7cde1391..1b810520 100644 --- a/server/web/policy.go +++ b/server/web/policy.go @@ -17,7 +17,7 @@ package web import ( "strings" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) // PolicyFunc defines a policy function which is invoked before the controller handler is executed. diff --git a/server/web/router.go b/server/web/router.go index 868a7631..5a663386 100644 --- a/server/web/router.go +++ b/server/web/router.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/core/utils" - beecontext "github.com/beego/beego/server/web/context" - "github.com/beego/beego/server/web/context/param" + "github.com/beego/beego/v2/core/utils" + beecontext "github.com/beego/beego/v2/server/web/context" + "github.com/beego/beego/v2/server/web/context/param" ) // default filter execution points diff --git a/server/web/router_test.go b/server/web/router_test.go index 3b69619a..87997322 100644 --- a/server/web/router_test.go +++ b/server/web/router_test.go @@ -21,9 +21,9 @@ import ( "strings" "testing" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) type TestController struct { diff --git a/server/web/server.go b/server/web/server.go index 88225527..f0a4f4ea 100644 --- a/server/web/server.go +++ b/server/web/server.go @@ -31,11 +31,11 @@ import ( "golang.org/x/crypto/acme/autocert" - "github.com/beego/beego/core/logs" - beecontext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/core/logs" + beecontext "github.com/beego/beego/v2/server/web/context" - "github.com/beego/beego/core/utils" - "github.com/beego/beego/server/web/grace" + "github.com/beego/beego/v2/core/utils" + "github.com/beego/beego/v2/server/web/grace" ) var ( diff --git a/server/web/session/README.md b/server/web/session/README.md index f59ad10e..20378bc2 100644 --- a/server/web/session/README.md +++ b/server/web/session/README.md @@ -5,7 +5,7 @@ session is a Go session manager. It can use many session providers. Just like th ## How to install? - go get github.com/beego/beego/session + go get github.com/beego/beego/v2/session ## What providers are supported? @@ -18,7 +18,7 @@ As of now this session manager support memory, file, Redis and MySQL. First you must import it import ( - "github.com/beego/beego/session" + "github.com/beego/beego/v2/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 4768ae53..ea94f501 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/session/couchbase" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/couchbase" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -41,7 +41,7 @@ import ( couchbase "github.com/couchbase/go-couchbase" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) var couchbpder = &Provider{} diff --git a/server/web/session/ledis/ledis_session.go b/server/web/session/ledis/ledis_session.go index 7ebc0c8c..8e34388b 100644 --- a/server/web/session/ledis/ledis_session.go +++ b/server/web/session/ledis/ledis_session.go @@ -12,7 +12,7 @@ import ( "github.com/ledisdb/ledisdb/config" "github.com/ledisdb/ledisdb/ledis" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) var ( diff --git a/server/web/session/memcache/sess_memcache.go b/server/web/session/memcache/sess_memcache.go index fe33dd6f..3f4c9842 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/session/memcache" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/memcache" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -38,7 +38,7 @@ import ( "strings" "sync" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" "github.com/bradfitz/gomemcache/memcache" ) diff --git a/server/web/session/mysql/sess_mysql.go b/server/web/session/mysql/sess_mysql.go index 91915b2c..d76ec287 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/session/mysql" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/mysql" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -47,7 +47,7 @@ import ( "sync" "time" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" // import mysql driver _ "github.com/go-sql-driver/mysql" ) diff --git a/server/web/session/postgres/sess_postgresql.go b/server/web/session/postgres/sess_postgresql.go index 96379155..7745ff5f 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/session/postgresql" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/postgresql" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -57,7 +57,7 @@ import ( "sync" "time" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" // import postgresql Driver _ "github.com/lib/pq" ) diff --git a/server/web/session/redis/sess_redis.go b/server/web/session/redis/sess_redis.go index 56afb6c2..e3d38be3 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/session/redis" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/redis" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -43,7 +43,7 @@ import ( "github.com/go-redis/redis/v7" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) var redispder = &Provider{} diff --git a/server/web/session/redis/sess_redis_test.go b/server/web/session/redis/sess_redis_test.go index 1ef38d81..fe5c363b 100644 --- a/server/web/session/redis/sess_redis_test.go +++ b/server/web/session/redis/sess_redis_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) func TestRedis(t *testing.T) { diff --git a/server/web/session/redis_cluster/redis_cluster.go b/server/web/session/redis_cluster/redis_cluster.go index b6de55c3..e94dccc3 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/session/redis_cluster" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/redis_cluster" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -43,7 +43,7 @@ import ( rediss "github.com/go-redis/redis/v7" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) var redispder = &Provider{} diff --git a/server/web/session/redis_sentinel/sess_redis_sentinel.go b/server/web/session/redis_sentinel/sess_redis_sentinel.go index 0f1030bd..2d64c6b4 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/session/redis_sentinel" -// "github.com/beego/beego/session" +// _ "github.com/beego/beego/v2/session/redis_sentinel" +// "github.com/beego/beego/v2/session" // ) // // func init() { @@ -43,7 +43,7 @@ import ( "github.com/go-redis/redis/v7" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) var redispder = &Provider{} diff --git a/server/web/session/redis_sentinel/sess_redis_sentinel_test.go b/server/web/session/redis_sentinel/sess_redis_sentinel_test.go index d786adbb..0a8030ce 100644 --- a/server/web/session/redis_sentinel/sess_redis_sentinel_test.go +++ b/server/web/session/redis_sentinel/sess_redis_sentinel_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) func TestRedisSentinel(t *testing.T) { diff --git a/server/web/session/sess_utils.go b/server/web/session/sess_utils.go index 4eed6154..23242d7a 100644 --- a/server/web/session/sess_utils.go +++ b/server/web/session/sess_utils.go @@ -29,7 +29,7 @@ import ( "strconv" "time" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) func init() { diff --git a/server/web/session/session.go b/server/web/session/session.go index 5975638f..b9eeb324 100644 --- a/server/web/session/session.go +++ b/server/web/session/session.go @@ -16,7 +16,7 @@ // // Usage: // import( -// "github.com/beego/beego/session" +// "github.com/beego/beego/v2/session" // ) // // func init() { diff --git a/server/web/session/ssdb/sess_ssdb.go b/server/web/session/ssdb/sess_ssdb.go index 8d0d20e0..c9add89e 100644 --- a/server/web/session/ssdb/sess_ssdb.go +++ b/server/web/session/ssdb/sess_ssdb.go @@ -11,7 +11,7 @@ import ( "github.com/ssdb/gossdb/ssdb" - "github.com/beego/beego/server/web/session" + "github.com/beego/beego/v2/server/web/session" ) var ssdbProvider = &Provider{} diff --git a/server/web/staticfile.go b/server/web/staticfile.go index 07302e98..988acad5 100644 --- a/server/web/staticfile.go +++ b/server/web/staticfile.go @@ -26,10 +26,10 @@ import ( "sync" "time" - "github.com/beego/beego/core/logs" + "github.com/beego/beego/v2/core/logs" lru "github.com/hashicorp/golang-lru" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) var errNotStaticRequest = errors.New("request not a static file request") diff --git a/server/web/statistics.go b/server/web/statistics.go index 5aa7747c..a92ec3f3 100644 --- a/server/web/statistics.go +++ b/server/web/statistics.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" ) // Statistics struct diff --git a/server/web/template.go b/server/web/template.go index 6c808019..897c73cf 100644 --- a/server/web/template.go +++ b/server/web/template.go @@ -27,8 +27,8 @@ import ( "strings" "sync" - "github.com/beego/beego/core/logs" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/logs" + "github.com/beego/beego/v2/core/utils" ) var ( diff --git a/server/web/template_test.go b/server/web/template_test.go index 1de04819..ecde2a6a 100644 --- a/server/web/template_test.go +++ b/server/web/template_test.go @@ -24,7 +24,7 @@ import ( assetfs "github.com/elazarl/go-bindata-assetfs" "github.com/stretchr/testify/assert" - "github.com/beego/beego/test" + "github.com/beego/beego/v2/test" ) var header = `{{define "header"}} diff --git a/server/web/tree.go b/server/web/tree.go index 7a62ebfc..dc459c49 100644 --- a/server/web/tree.go +++ b/server/web/tree.go @@ -19,9 +19,9 @@ import ( "regexp" "strings" - "github.com/beego/beego/core/utils" + "github.com/beego/beego/v2/core/utils" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) var ( diff --git a/server/web/tree_test.go b/server/web/tree_test.go index 09826bc2..05b6c93f 100644 --- a/server/web/tree_test.go +++ b/server/web/tree_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "github.com/beego/beego/server/web/context" + "github.com/beego/beego/v2/server/web/context" ) type testInfo struct { @@ -93,7 +93,7 @@ func init() { //not match example - // https://github.com/beego/beego/issues/3865 + // https://github.com/beego/beego/v2/issues/3865 routers = append(routers, notMatchTestInfo("/read_:id:int\\.htm", "/read_222htm")) routers = append(routers, notMatchTestInfo("/read_:id:int\\.htm", "/read_222_htm")) routers = append(routers, notMatchTestInfo("/read_:id:int\\.htm", " /read_262shtm")) diff --git a/task/govenor_command.go b/task/govenor_command.go index d08b12d3..20238435 100644 --- a/task/govenor_command.go +++ b/task/govenor_command.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" - "github.com/beego/beego/core/admin" + "github.com/beego/beego/v2/core/admin" ) type listTaskCommand struct {