diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE index db349198..8e474075 100644 --- a/.github/ISSUE_TEMPLATE +++ b/.github/ISSUE_TEMPLATE @@ -14,4 +14,4 @@ A complete runnable program is good. 4. What did you expect to see? -5. What did you see instead? \ No newline at end of file +5. What did you see instead? diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 3a4d2e9a..412274a3 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -16,4 +16,4 @@ jobs: stale-issue-message: 'This issue is inactive for a long time.' stale-pr-message: 'This PR is inactive for a long time' stale-issue-label: 'inactive-issue' - stale-pr-label: 'inactive-pr' \ No newline at end of file + stale-pr-label: 'inactive-pr' diff --git a/.travis.yml b/.travis.yml index 973b40ef..413167d1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ services: - docker env: global: - - GO_REPO_FULLNAME="github.com/astaxie/beego" + - GO_REPO_FULLNAME="github.com/beego/beego" matrix: - ORM_DRIVER=sqlite3 ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db - ORM_DRIVER=postgres ORM_SOURCE="user=postgres dbname=orm_test sslmode=disable" @@ -102,4 +102,4 @@ script: - find . ! \( -path './vendor' -prune \) -type f -name '*.go' -print0 | xargs -0 gofmt -l -s - golint ./... addons: - postgresql: "9.6" \ No newline at end of file + postgresql: "9.6" diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cb279cbb..f9f9a1a5 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/astaxie/beego/issues) before anybody +issue](https://github.com/beego/beego/issues) before anybody starts working on it. Also when filing an issue, make sure to answer these five questions: @@ -90,4 +90,4 @@ never hurts to add a quick "+1" or "I have this problem too". This will help prioritize the most common problems and requests. Also, if you don't know how to use it. please make sure you have read through -the docs in http://beego.me/docs \ No newline at end of file +the docs in http://beego.me/docs diff --git a/LICENSE b/LICENSE index 5dbd4243..26050108 100644 --- a/LICENSE +++ b/LICENSE @@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. diff --git a/README.md b/README.md index dc048bba..92de4463 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/astaxie/beego?status.svg)](http://godoc.org/github.com/astaxie/beego) [![Foundation](https://img.shields.io/badge/Golang-Foundation-green.svg)](http://golangfoundation.org) [![Go Report Card](https://goreportcard.com/badge/github.com/astaxie/beego)](https://goreportcard.com/report/github.com/astaxie/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?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 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/astaxie/beego@v2.0.0 + go get github.com/beego/beego@v2.0.0 #### Create file `hello.go` ```go package main -import "github.com/astaxie/beego/server/web" +import "github.com/beego/beego/server/web" func main() { web.Run() diff --git a/adapter/admin.go b/adapter/admin.go index 828ee399..ef6705dd 100644 --- a/adapter/admin.go +++ b/adapter/admin.go @@ -17,8 +17,8 @@ package adapter import ( "time" - _ "github.com/astaxie/beego/core/admin" - "github.com/astaxie/beego/server/web" + _ "github.com/beego/beego/core/admin" + "github.com/beego/beego/server/web" ) // FilterMonitorFunc is default monitor filter when admin module is enable. diff --git a/adapter/app.go b/adapter/app.go index e20cd9d2..a4775011 100644 --- a/adapter/app.go +++ b/adapter/app.go @@ -17,9 +17,9 @@ package adapter import ( "net/http" - context2 "github.com/astaxie/beego/adapter/context" - "github.com/astaxie/beego/server/web" - "github.com/astaxie/beego/server/web/context" + context2 "github.com/beego/beego/adapter/context" + "github.com/beego/beego/server/web" + "github.com/beego/beego/server/web/context" ) var ( diff --git a/adapter/beego.go b/adapter/beego.go index bbe37db8..8dd3fab3 100644 --- a/adapter/beego.go +++ b/adapter/beego.go @@ -15,8 +15,8 @@ package adapter import ( - "github.com/astaxie/beego" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego" + "github.com/beego/beego/server/web" ) const ( diff --git a/adapter/cache/cache.go b/adapter/cache/cache.go index 82585c4e..1a492642 100644 --- a/adapter/cache/cache.go +++ b/adapter/cache/cache.go @@ -16,7 +16,7 @@ // Usage: // // import( -// "github.com/astaxie/beego/cache" +// "github.com/beego/beego/cache" // ) // // bm, err := cache.NewCache("memory", `{"interval":60}`) diff --git a/adapter/cache/cache_adapter.go b/adapter/cache/cache_adapter.go index 3bfd0bf8..7c808c68 100644 --- a/adapter/cache/cache_adapter.go +++ b/adapter/cache/cache_adapter.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/astaxie/beego/client/cache" + "github.com/beego/beego/client/cache" ) type newToOldCacheAdapter struct { diff --git a/adapter/cache/conv.go b/adapter/cache/conv.go index 18b8a255..4be3d118 100644 --- a/adapter/cache/conv.go +++ b/adapter/cache/conv.go @@ -15,7 +15,7 @@ package cache import ( - "github.com/astaxie/beego/client/cache" + "github.com/beego/beego/client/cache" ) // GetString convert interface to string. diff --git a/adapter/cache/file.go b/adapter/cache/file.go index 74eb980a..ba9a66e7 100644 --- a/adapter/cache/file.go +++ b/adapter/cache/file.go @@ -15,7 +15,7 @@ package cache import ( - "github.com/astaxie/beego/client/cache" + "github.com/beego/beego/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 b4da1bfe..5f20f09c 100644 --- a/adapter/cache/memcache/memcache.go +++ b/adapter/cache/memcache/memcache.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/cache/memcache" -// "github.com/astaxie/beego/cache" +// _ "github.com/beego/beego/cache/memcache" +// "github.com/beego/beego/cache" // ) // // bm, err := cache.NewCache("memcache", `{"conn":"127.0.0.1:11211"}`) @@ -30,8 +30,8 @@ package memcache import ( - "github.com/astaxie/beego/adapter/cache" - "github.com/astaxie/beego/client/cache/memcache" + "github.com/beego/beego/adapter/cache" + "github.com/beego/beego/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 b9b6dc6b..c22685c3 100644 --- a/adapter/cache/memcache/memcache_test.go +++ b/adapter/cache/memcache/memcache_test.go @@ -21,7 +21,7 @@ import ( "testing" "time" - "github.com/astaxie/beego/adapter/cache" + "github.com/beego/beego/adapter/cache" ) func TestMemcacheCache(t *testing.T) { diff --git a/adapter/cache/memory.go b/adapter/cache/memory.go index cf6e3992..c1625bef 100644 --- a/adapter/cache/memory.go +++ b/adapter/cache/memory.go @@ -15,7 +15,7 @@ package cache import ( - "github.com/astaxie/beego/client/cache" + "github.com/beego/beego/client/cache" ) // NewMemoryCache returns a new MemoryCache. diff --git a/adapter/cache/redis/redis.go b/adapter/cache/redis/redis.go index 3562057d..6fc7e368 100644 --- a/adapter/cache/redis/redis.go +++ b/adapter/cache/redis/redis.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/cache/redis" -// "github.com/astaxie/beego/cache" +// _ "github.com/beego/beego/cache/redis" +// "github.com/beego/beego/cache" // ) // // bm, err := cache.NewCache("redis", `{"conn":"127.0.0.1:11211"}`) @@ -30,8 +30,8 @@ package redis import ( - "github.com/astaxie/beego/adapter/cache" - redis2 "github.com/astaxie/beego/client/cache/redis" + "github.com/beego/beego/adapter/cache" + redis2 "github.com/beego/beego/client/cache/redis" ) var ( diff --git a/adapter/cache/redis/redis_test.go b/adapter/cache/redis/redis_test.go index 7ae12197..c34b7310 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/astaxie/beego/adapter/cache" + "github.com/beego/beego/adapter/cache" ) func TestRedisCache(t *testing.T) { diff --git a/adapter/cache/ssdb/ssdb.go b/adapter/cache/ssdb/ssdb.go index df552043..22c330c1 100644 --- a/adapter/cache/ssdb/ssdb.go +++ b/adapter/cache/ssdb/ssdb.go @@ -1,8 +1,8 @@ package ssdb import ( - "github.com/astaxie/beego/adapter/cache" - ssdb2 "github.com/astaxie/beego/client/cache/ssdb" + "github.com/beego/beego/adapter/cache" + ssdb2 "github.com/beego/beego/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 080167cd..b6a4d89f 100644 --- a/adapter/cache/ssdb/ssdb_test.go +++ b/adapter/cache/ssdb/ssdb_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/astaxie/beego/adapter/cache" + "github.com/beego/beego/adapter/cache" ) func TestSsdbcacheCache(t *testing.T) { diff --git a/adapter/config.go b/adapter/config.go index 6280b8f8..86425d42 100644 --- a/adapter/config.go +++ b/adapter/config.go @@ -15,9 +15,9 @@ package adapter import ( - "github.com/astaxie/beego/adapter/session" - newCfg "github.com/astaxie/beego/core/config" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/adapter/session" + newCfg "github.com/beego/beego/core/config" + "github.com/beego/beego/server/web" ) // Config is the main struct for BConfig diff --git a/adapter/config/adapter.go b/adapter/config/adapter.go index 0a9e1d0c..4af024b2 100644 --- a/adapter/config/adapter.go +++ b/adapter/config/adapter.go @@ -17,7 +17,7 @@ package config import ( "github.com/pkg/errors" - "github.com/astaxie/beego/core/config" + "github.com/beego/beego/core/config" ) type newToOldConfigerAdapter struct { diff --git a/adapter/config/config.go b/adapter/config/config.go index 703555cd..4c992aff 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/astaxie/beego/config" +// import "github.com/beego/beego/config" // Examples. // // cnf, err := config.NewConfig("ini", "config.conf") @@ -41,7 +41,7 @@ package config import ( - "github.com/astaxie/beego/core/config" + "github.com/beego/beego/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 839c60c1..da149feb 100644 --- a/adapter/config/env/env.go +++ b/adapter/config/env/env.go @@ -17,7 +17,7 @@ package env import ( - "github.com/astaxie/beego/core/config/env" + "github.com/beego/beego/core/config/env" ) // Get returns a value by key. diff --git a/adapter/config/fake.go b/adapter/config/fake.go index 050f0252..d8cc7416 100644 --- a/adapter/config/fake.go +++ b/adapter/config/fake.go @@ -15,7 +15,7 @@ package config import ( - "github.com/astaxie/beego/core/config" + "github.com/beego/beego/core/config" ) // NewFakeConfig return a fake Configer diff --git a/adapter/config/json.go b/adapter/config/json.go index d77e6146..08d3e8a5 100644 --- a/adapter/config/json.go +++ b/adapter/config/json.go @@ -15,5 +15,5 @@ package config import ( - _ "github.com/astaxie/beego/core/config/json" + _ "github.com/beego/beego/core/config/json" ) diff --git a/adapter/config/xml/xml.go b/adapter/config/xml/xml.go index 28d5f44e..5af8df29 100644 --- a/adapter/config/xml/xml.go +++ b/adapter/config/xml/xml.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/config/xml" -// "github.com/astaxie/beego/config" +// _ "github.com/beego/beego/config/xml" +// "github.com/beego/beego/config" // ) // // cnf, err := config.NewConfig("xml", "config.xml") @@ -30,5 +30,5 @@ package xml import ( - _ "github.com/astaxie/beego/core/config/xml" + _ "github.com/beego/beego/core/config/xml" ) diff --git a/adapter/config/xml/xml_test.go b/adapter/config/xml/xml_test.go index ae9b209e..87e3a079 100644 --- a/adapter/config/xml/xml_test.go +++ b/adapter/config/xml/xml_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/astaxie/beego/adapter/config" + "github.com/beego/beego/adapter/config" ) func TestXML(t *testing.T) { diff --git a/adapter/config/yaml/yaml.go b/adapter/config/yaml/yaml.go index 196c9725..f6ef9d82 100644 --- a/adapter/config/yaml/yaml.go +++ b/adapter/config/yaml/yaml.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/config/yaml" -// "github.com/astaxie/beego/config" +// _ "github.com/beego/beego/config/yaml" +// "github.com/beego/beego/config" // ) // // cnf, err := config.NewConfig("yaml", "config.yaml") @@ -30,5 +30,5 @@ package yaml import ( - _ "github.com/astaxie/beego/core/config/yaml" + _ "github.com/beego/beego/core/config/yaml" ) diff --git a/adapter/config/yaml/yaml_test.go b/adapter/config/yaml/yaml_test.go index a72e435e..4f7e07f3 100644 --- a/adapter/config/yaml/yaml_test.go +++ b/adapter/config/yaml/yaml_test.go @@ -19,7 +19,7 @@ import ( "os" "testing" - "github.com/astaxie/beego/adapter/config" + "github.com/beego/beego/adapter/config" ) func TestYaml(t *testing.T) { diff --git a/adapter/context/acceptencoder.go b/adapter/context/acceptencoder.go index 4bfef95e..b860ab36 100644 --- a/adapter/context/acceptencoder.go +++ b/adapter/context/acceptencoder.go @@ -19,7 +19,7 @@ import ( "net/http" "os" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) // InitGzip init the gzipcompress diff --git a/adapter/context/context.go b/adapter/context/context.go index 123fdb2c..99eb17ae 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/astaxie/beego/context" +// import "github.com/beego/beego/context" // // ctx := context.Context{Request:req,ResponseWriter:rw} // @@ -27,7 +27,7 @@ import ( "net" "net/http" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) // commonly used mime-types diff --git a/adapter/context/input.go b/adapter/context/input.go index 51bb9ea5..fdbdd358 100644 --- a/adapter/context/input.go +++ b/adapter/context/input.go @@ -15,7 +15,7 @@ package context import ( - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/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 0223679b..78ccc419 100644 --- a/adapter/context/output.go +++ b/adapter/context/output.go @@ -15,7 +15,7 @@ package context import ( - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) // BeegoOutput does work for sending response header. diff --git a/adapter/context/renderer.go b/adapter/context/renderer.go index 1309365a..e443c83b 100644 --- a/adapter/context/renderer.go +++ b/adapter/context/renderer.go @@ -1,7 +1,7 @@ package context import ( - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) // Renderer defines an http response renderer diff --git a/adapter/controller.go b/adapter/controller.go index a56d1743..2f828887 100644 --- a/adapter/controller.go +++ b/adapter/controller.go @@ -18,10 +18,10 @@ import ( "mime/multipart" "net/url" - "github.com/astaxie/beego/adapter/session" - webContext "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/adapter/session" + webContext "github.com/beego/beego/server/web/context" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/server/web" ) var ( diff --git a/adapter/error.go b/adapter/error.go index 35ff7f35..7524eff9 100644 --- a/adapter/error.go +++ b/adapter/error.go @@ -17,10 +17,10 @@ package adapter import ( "net/http" - "github.com/astaxie/beego/adapter/context" - beecontext "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/adapter/context" + beecontext "github.com/beego/beego/server/web/context" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/server/web" ) const ( diff --git a/adapter/filter.go b/adapter/filter.go index 283d8879..803ec6c6 100644 --- a/adapter/filter.go +++ b/adapter/filter.go @@ -15,9 +15,9 @@ package adapter import ( - "github.com/astaxie/beego/adapter/context" - "github.com/astaxie/beego/server/web" - beecontext "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/adapter/context" + "github.com/beego/beego/server/web" + beecontext "github.com/beego/beego/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 2b47ee62..806345a6 100644 --- a/adapter/flash.go +++ b/adapter/flash.go @@ -15,7 +15,7 @@ package adapter import ( - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/server/web" ) // FlashData is a tools to maintain data when using across request. diff --git a/adapter/fs.go b/adapter/fs.go index e48e75b5..b2d2a567 100644 --- a/adapter/fs.go +++ b/adapter/fs.go @@ -18,7 +18,7 @@ import ( "net/http" "path/filepath" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/server/web" ) type FileSystem web.FileSystem diff --git a/adapter/grace/grace.go b/adapter/grace/grace.go index 75ceef21..12928042 100644 --- a/adapter/grace/grace.go +++ b/adapter/grace/grace.go @@ -22,7 +22,7 @@ // "net/http" // "os" // -// "github.com/astaxie/beego/grace" +// "github.com/beego/beego/grace" // ) // // func handler(w http.ResponseWriter, r *http.Request) { @@ -46,7 +46,7 @@ import ( "net/http" "time" - "github.com/astaxie/beego/server/web/grace" + "github.com/beego/beego/server/web/grace" ) const ( diff --git a/adapter/grace/server.go b/adapter/grace/server.go index 0dfb2fd6..5e659134 100644 --- a/adapter/grace/server.go +++ b/adapter/grace/server.go @@ -3,7 +3,7 @@ package grace import ( "os" - "github.com/astaxie/beego/server/web/grace" + "github.com/beego/beego/server/web/grace" ) // Server embedded http.Server diff --git a/adapter/httplib/httplib.go b/adapter/httplib/httplib.go index d9ff1ea5..593cf39a 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/astaxie/beego/httplib" +// import "github.com/beego/beego/httplib" // // b := httplib.Post("http://beego.me/") // b.Param("username","astaxie") @@ -38,7 +38,7 @@ import ( "net/url" "time" - "github.com/astaxie/beego/client/httplib" + "github.com/beego/beego/client/httplib" ) // SetDefaultSetting Overwrite default settings diff --git a/adapter/log.go b/adapter/log.go index 9d07ec1a..0042b7b5 100644 --- a/adapter/log.go +++ b/adapter/log.go @@ -17,13 +17,13 @@ package adapter import ( "strings" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" - webLog "github.com/astaxie/beego/core/logs" + webLog "github.com/beego/beego/core/logs" ) // Log levels to control the logging output. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. const ( LevelEmergency = webLog.LevelEmergency LevelAlert = webLog.LevelAlert @@ -36,90 +36,90 @@ const ( ) // BeeLogger references the used application logger. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. var BeeLogger = logs.GetBeeLogger() // SetLevel sets the global log level used by the simple logger. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func SetLevel(l int) { logs.SetLevel(l) } // SetLogFuncCall set the CallDepth, default is 3 -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func SetLogFuncCall(b bool) { logs.SetLogFuncCall(b) } // SetLogger sets a new logger. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/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/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func Emergency(v ...interface{}) { logs.Emergency(generateFmtStr(len(v)), v...) } // Alert logs a message at alert level. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func Alert(v ...interface{}) { logs.Alert(generateFmtStr(len(v)), v...) } // Critical logs a message at critical level. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func Critical(v ...interface{}) { logs.Critical(generateFmtStr(len(v)), v...) } // Error logs a message at error level. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func Error(v ...interface{}) { logs.Error(generateFmtStr(len(v)), v...) } // Warning logs a message at warning level. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func Warning(v ...interface{}) { logs.Warning(generateFmtStr(len(v)), v...) } // Warn compatibility alias for Warning() -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func Warn(v ...interface{}) { logs.Warn(generateFmtStr(len(v)), v...) } // Notice logs a message at notice level. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func Notice(v ...interface{}) { logs.Notice(generateFmtStr(len(v)), v...) } // Informational logs a message at info level. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func Informational(v ...interface{}) { logs.Informational(generateFmtStr(len(v)), v...) } // Info compatibility alias for Warning() -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/logs instead. func Info(v ...interface{}) { logs.Info(generateFmtStr(len(v)), v...) } // Debug logs a message at debug level. -// Deprecated: use github.com/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/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/astaxie/beego/logs instead. +// Deprecated: use github.com/beego/beego/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 a2150884..f702a820 100644 --- a/adapter/logs/accesslog.go +++ b/adapter/logs/accesslog.go @@ -15,7 +15,7 @@ package logs import ( - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" ) // AccessLogRecord struct for holding access log data. diff --git a/adapter/logs/alils/alils.go b/adapter/logs/alils/alils.go index 941cba4c..d5d6707d 100644 --- a/adapter/logs/alils/alils.go +++ b/adapter/logs/alils/alils.go @@ -1,5 +1,5 @@ package alils import ( - _ "github.com/astaxie/beego/core/logs/alils" + _ "github.com/beego/beego/core/logs/alils" ) diff --git a/adapter/logs/es/es.go b/adapter/logs/es/es.go index 0f0fd607..e85c0170 100644 --- a/adapter/logs/es/es.go +++ b/adapter/logs/es/es.go @@ -1,5 +1,5 @@ package es import ( - _ "github.com/astaxie/beego/core/logs/es" + _ "github.com/beego/beego/core/logs/es" ) diff --git a/adapter/logs/log.go b/adapter/logs/log.go index 54eb24d5..8efe9a91 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/astaxie/beego/logs" +// import "github.com/beego/beego/logs" // // log := NewLogger(10000) // log.SetLogger("console", "") @@ -37,7 +37,7 @@ import ( "log" "time" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" ) // RFC5424 log message levels. diff --git a/adapter/logs/log_adapter.go b/adapter/logs/log_adapter.go index 6b7022d6..26eff679 100644 --- a/adapter/logs/log_adapter.go +++ b/adapter/logs/log_adapter.go @@ -17,7 +17,7 @@ package logs import ( "time" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" ) type oldToNewAdapter struct { diff --git a/adapter/logs/logger.go b/adapter/logs/logger.go index 5a8e0a1c..a4eff63b 100644 --- a/adapter/logs/logger.go +++ b/adapter/logs/logger.go @@ -15,7 +15,7 @@ package logs import ( - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" ) // ColorByStatus return color by http code diff --git a/adapter/metric/prometheus.go b/adapter/metric/prometheus.go index 4660f626..704c6c05 100644 --- a/adapter/metric/prometheus.go +++ b/adapter/metric/prometheus.go @@ -23,9 +23,9 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/astaxie/beego" - "github.com/astaxie/beego/core/logs" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego" + "github.com/beego/beego/core/logs" + "github.com/beego/beego/server/web" ) func PrometheusMiddleWare(next http.Handler) http.Handler { diff --git a/adapter/metric/prometheus_test.go b/adapter/metric/prometheus_test.go index 751348bf..3a733071 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/astaxie/beego/adapter/context" + "github.com/beego/beego/adapter/context" ) func TestPrometheusMiddleWare(t *testing.T) { diff --git a/adapter/migration/ddl.go b/adapter/migration/ddl.go index b43b4d34..9fc0cda8 100644 --- a/adapter/migration/ddl.go +++ b/adapter/migration/ddl.go @@ -15,7 +15,7 @@ package migration import ( - "github.com/astaxie/beego/client/orm/migration" + "github.com/beego/beego/client/orm/migration" ) // Index struct defines the structure of Index Columns diff --git a/adapter/migration/migration.go b/adapter/migration/migration.go index 677c35ca..7bb8cea2 100644 --- a/adapter/migration/migration.go +++ b/adapter/migration/migration.go @@ -28,7 +28,7 @@ package migration import ( - "github.com/astaxie/beego/client/orm/migration" + "github.com/beego/beego/client/orm/migration" ) // const the data format for the bee generate migration datatype diff --git a/adapter/namespace.go b/adapter/namespace.go index 98cbd8a5..27e21dfa 100644 --- a/adapter/namespace.go +++ b/adapter/namespace.go @@ -17,10 +17,10 @@ package adapter import ( "net/http" - adtContext "github.com/astaxie/beego/adapter/context" - "github.com/astaxie/beego/server/web/context" + adtContext "github.com/beego/beego/adapter/context" + "github.com/beego/beego/server/web/context" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/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/astaxie/beego#Router +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#AutoRouter +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#AutoPrefix +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Get +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Post +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Delete +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Put +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Head +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Options +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Patch +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Any +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Handler +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Include +// refer: https://godoc.org/github.com/beego/beego#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 fcbd1be4..21a4c368 100644 --- a/adapter/orm/cmd.go +++ b/adapter/orm/cmd.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/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 fd878732..006759e6 100644 --- a/adapter/orm/db.go +++ b/adapter/orm/db.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) var ( diff --git a/adapter/orm/db_alias.go b/adapter/orm/db_alias.go index 81a07207..aaef916a 100644 --- a/adapter/orm/db_alias.go +++ b/adapter/orm/db_alias.go @@ -19,7 +19,7 @@ import ( "database/sql" "time" - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) // DriverType database driver constant int. diff --git a/adapter/orm/models.go b/adapter/orm/models.go index 5df64d6d..2e07ef1f 100644 --- a/adapter/orm/models.go +++ b/adapter/orm/models.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/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 0b07de59..df6a57d0 100644 --- a/adapter/orm/models_boot.go +++ b/adapter/orm/models_boot.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) // RegisterModel register models diff --git a/adapter/orm/models_fields.go b/adapter/orm/models_fields.go index 6210567b..928e94e1 100644 --- a/adapter/orm/models_fields.go +++ b/adapter/orm/models_fields.go @@ -17,7 +17,7 @@ package orm import ( "time" - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) // Define the Type enum diff --git a/adapter/orm/orm.go b/adapter/orm/orm.go index 15df76ed..b7bb75f4 100644 --- a/adapter/orm/orm.go +++ b/adapter/orm/orm.go @@ -21,7 +21,7 @@ // // import ( // "fmt" -// "github.com/astaxie/beego/orm" +// "github.com/beego/beego/orm" // _ "github.com/go-sql-driver/mysql" // import your used driver // ) // @@ -58,9 +58,9 @@ import ( "database/sql" "errors" - "github.com/astaxie/beego/client/orm" - "github.com/astaxie/beego/client/orm/hints" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/client/orm" + "github.com/beego/beego/client/orm/hints" + "github.com/beego/beego/core/utils" ) // DebugQueries define the debug diff --git a/adapter/orm/orm_conds.go b/adapter/orm/orm_conds.go index f70f0f5b..c06930da 100644 --- a/adapter/orm/orm_conds.go +++ b/adapter/orm/orm_conds.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) // ExprSep define the expression separation diff --git a/adapter/orm/orm_log.go b/adapter/orm/orm_log.go index 3ff7f01c..278c427f 100644 --- a/adapter/orm/orm_log.go +++ b/adapter/orm/orm_log.go @@ -17,7 +17,7 @@ package orm import ( "io" - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) // Log implement the log.Logger diff --git a/adapter/orm/orm_queryset.go b/adapter/orm/orm_queryset.go index 1926a6c0..9fe71112 100644 --- a/adapter/orm/orm_queryset.go +++ b/adapter/orm/orm_queryset.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) // define Col operations diff --git a/adapter/orm/qb.go b/adapter/orm/qb.go index 63eaed8a..6d764884 100644 --- a/adapter/orm/qb.go +++ b/adapter/orm/qb.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) // QueryBuilder is the Query builder interface diff --git a/adapter/orm/qb_mysql.go b/adapter/orm/qb_mysql.go index ef87ebab..cba11e95 100644 --- a/adapter/orm/qb_mysql.go +++ b/adapter/orm/qb_mysql.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) // CommaSpace is the separation diff --git a/adapter/orm/qb_tidb.go b/adapter/orm/qb_tidb.go index 18631ef0..e2a28458 100644 --- a/adapter/orm/qb_tidb.go +++ b/adapter/orm/qb_tidb.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) // TiDBQueryBuilder is the SQL build diff --git a/adapter/orm/query_setter_adapter.go b/adapter/orm/query_setter_adapter.go index d6c268b6..dfe0ec86 100644 --- a/adapter/orm/query_setter_adapter.go +++ b/adapter/orm/query_setter_adapter.go @@ -15,7 +15,7 @@ package orm import ( - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) type baseQuerySetter struct { diff --git a/adapter/orm/types.go b/adapter/orm/types.go index 6db5066c..a5698eaa 100644 --- a/adapter/orm/types.go +++ b/adapter/orm/types.go @@ -18,7 +18,7 @@ import ( "context" "database/sql" - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) // Params stores the Params diff --git a/adapter/orm/utils.go b/adapter/orm/utils.go index 37ba86d8..900d3b1f 100644 --- a/adapter/orm/utils.go +++ b/adapter/orm/utils.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/astaxie/beego/client/orm" + "github.com/beego/beego/client/orm" ) type fn func(string) string diff --git a/adapter/plugins/apiauth/apiauth.go b/adapter/plugins/apiauth/apiauth.go index 90311d8f..cfd54324 100644 --- a/adapter/plugins/apiauth/apiauth.go +++ b/adapter/plugins/apiauth/apiauth.go @@ -16,8 +16,8 @@ // // Simple Usage: // import( -// "github.com/astaxie/beego" -// "github.com/astaxie/beego/plugins/apiauth" +// "github.com/beego/beego" +// "github.com/beego/beego/plugins/apiauth" // ) // // func main(){ @@ -58,10 +58,10 @@ package apiauth import ( "net/url" - beego "github.com/astaxie/beego/adapter" - "github.com/astaxie/beego/adapter/context" - beecontext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/server/web/filter/apiauth" + 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" ) // AppIDToAppSecret is used to get appsecret throw appid diff --git a/adapter/plugins/auth/basic.go b/adapter/plugins/auth/basic.go index 578a16d9..75677a84 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/astaxie/beego" -// "github.com/astaxie/beego/plugins/auth" +// "github.com/beego/beego" +// "github.com/beego/beego/plugins/auth" // ) // // func main(){ @@ -38,10 +38,10 @@ package auth import ( "net/http" - beego "github.com/astaxie/beego/adapter" - "github.com/astaxie/beego/adapter/context" - beecontext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/server/web/filter/auth" + 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" ) // Basic is the http basic auth diff --git a/adapter/plugins/authz/authz.go b/adapter/plugins/authz/authz.go index 3f84467e..00cddb45 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/astaxie/beego" -// "github.com/astaxie/beego/plugins/authz" +// "github.com/beego/beego" +// "github.com/beego/beego/plugins/authz" // "github.com/casbin/casbin" // ) // @@ -44,10 +44,10 @@ import ( "github.com/casbin/casbin" - beego "github.com/astaxie/beego/adapter" - "github.com/astaxie/beego/adapter/context" - beecontext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/server/web/filter/authz" + 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" ) // NewAuthorizer returns the authorizer. diff --git a/adapter/plugins/authz/authz_model.conf b/adapter/plugins/authz/authz_model.conf index d1b3dbd7..fd2f08df 100644 --- a/adapter/plugins/authz/authz_model.conf +++ b/adapter/plugins/authz/authz_model.conf @@ -11,4 +11,4 @@ g = _, _ e = some(where (p.eft == allow)) [matchers] -m = g(r.sub, p.sub) && keyMatch(r.obj, p.obj) && (r.act == p.act || p.act == "*") \ No newline at end of file +m = g(r.sub, p.sub) && keyMatch(r.obj, p.obj) && (r.act == p.act || p.act == "*") diff --git a/adapter/plugins/authz/authz_policy.csv b/adapter/plugins/authz/authz_policy.csv index c062dd3e..9203e11f 100644 --- a/adapter/plugins/authz/authz_policy.csv +++ b/adapter/plugins/authz/authz_policy.csv @@ -4,4 +4,4 @@ p, bob, /dataset2/resource1, * p, bob, /dataset2/resource2, GET p, bob, /dataset2/folder1/*, POST p, dataset1_admin, /dataset1/*, * -g, cathy, dataset1_admin \ No newline at end of file +g, cathy, dataset1_admin diff --git a/adapter/plugins/authz/authz_test.go b/adapter/plugins/authz/authz_test.go index 9b4f21c2..6e21c726 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/astaxie/beego/adapter" - "github.com/astaxie/beego/adapter/context" - "github.com/astaxie/beego/adapter/plugins/auth" + beego "github.com/beego/beego/adapter" + "github.com/beego/beego/adapter/context" + "github.com/beego/beego/adapter/plugins/auth" "github.com/casbin/casbin" ) diff --git a/adapter/plugins/cors/cors.go b/adapter/plugins/cors/cors.go index a15d5417..5e8a5cd9 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/astaxie/beego" -// "github.com/astaxie/beego/plugins/cors" +// "github.com/beego/beego" +// "github.com/beego/beego/plugins/cors" // ) // // func main() { @@ -36,11 +36,11 @@ package cors import ( - beego "github.com/astaxie/beego/adapter" - beecontext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/server/web/filter/cors" + beego "github.com/beego/beego/adapter" + beecontext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/server/web/filter/cors" - "github.com/astaxie/beego/adapter/context" + "github.com/beego/beego/adapter/context" ) // Options represents Access Control options. diff --git a/adapter/policy.go b/adapter/policy.go index 6f334d2d..7e0b8655 100644 --- a/adapter/policy.go +++ b/adapter/policy.go @@ -15,9 +15,9 @@ package adapter import ( - "github.com/astaxie/beego/adapter/context" - "github.com/astaxie/beego/server/web" - beecontext "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/adapter/context" + "github.com/beego/beego/server/web" + beecontext "github.com/beego/beego/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 c91a09f1..325f1f42 100644 --- a/adapter/router.go +++ b/adapter/router.go @@ -18,10 +18,10 @@ import ( "net/http" "time" - beecontext "github.com/astaxie/beego/adapter/context" - "github.com/astaxie/beego/server/web/context" + beecontext "github.com/beego/beego/adapter/context" + "github.com/beego/beego/server/web/context" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/server/web" ) // default filter execution points diff --git a/adapter/session/couchbase/sess_couchbase.go b/adapter/session/couchbase/sess_couchbase.go index b6afb612..5e578675 100644 --- a/adapter/session/couchbase/sess_couchbase.go +++ b/adapter/session/couchbase/sess_couchbase.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/session/couchbase" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/couchbase" +// "github.com/beego/beego/session" // ) // // func init() { @@ -36,8 +36,8 @@ import ( "context" "net/http" - "github.com/astaxie/beego/adapter/session" - beecb "github.com/astaxie/beego/server/web/session/couchbase" + "github.com/beego/beego/adapter/session" + beecb "github.com/beego/beego/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 350cbdaa..ec0ba536 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/astaxie/beego/adapter/session" - beeLedis "github.com/astaxie/beego/server/web/session/ledis" + "github.com/beego/beego/adapter/session" + beeLedis "github.com/beego/beego/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 772839cd..7bff7de8 100644 --- a/adapter/session/memcache/sess_memcache.go +++ b/adapter/session/memcache/sess_memcache.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/session/memcache" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/memcache" +// "github.com/beego/beego/session" // ) // // func init() { @@ -36,9 +36,9 @@ import ( "context" "net/http" - "github.com/astaxie/beego/adapter/session" + "github.com/beego/beego/adapter/session" - beemem "github.com/astaxie/beego/server/web/session/memcache" + beemem "github.com/beego/beego/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 5d7e1dac..5dbf656d 100644 --- a/adapter/session/mysql/sess_mysql.go +++ b/adapter/session/mysql/sess_mysql.go @@ -28,8 +28,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/session/mysql" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/mysql" +// "github.com/beego/beego/session" // ) // // func init() { @@ -44,8 +44,8 @@ import ( "context" "net/http" - "github.com/astaxie/beego/adapter/session" - "github.com/astaxie/beego/server/web/session/mysql" + "github.com/beego/beego/adapter/session" + "github.com/beego/beego/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 879b2b83..2fb52c9d 100644 --- a/adapter/session/postgres/sess_postgresql.go +++ b/adapter/session/postgres/sess_postgresql.go @@ -38,8 +38,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/session/postgresql" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/postgresql" +// "github.com/beego/beego/session" // ) // // func init() { @@ -54,11 +54,11 @@ import ( "context" "net/http" - "github.com/astaxie/beego/adapter/session" + "github.com/beego/beego/adapter/session" // import postgresql Driver _ "github.com/lib/pq" - "github.com/astaxie/beego/server/web/session/postgres" + "github.com/beego/beego/server/web/session/postgres" ) // SessionStore postgresql session store diff --git a/adapter/session/provider_adapter.go b/adapter/session/provider_adapter.go index 596bc6a6..7225fba6 100644 --- a/adapter/session/provider_adapter.go +++ b/adapter/session/provider_adapter.go @@ -17,7 +17,7 @@ package session import ( "context" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/server/web/session" ) type oldToNewProviderAdapter struct { diff --git a/adapter/session/redis/sess_redis.go b/adapter/session/redis/sess_redis.go index bb8e8be4..9d9f0809 100644 --- a/adapter/session/redis/sess_redis.go +++ b/adapter/session/redis/sess_redis.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/session/redis" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/redis" +// "github.com/beego/beego/session" // ) // // func init() { @@ -36,9 +36,9 @@ import ( "context" "net/http" - "github.com/astaxie/beego/adapter/session" + "github.com/beego/beego/adapter/session" - beeRedis "github.com/astaxie/beego/server/web/session/redis" + beeRedis "github.com/beego/beego/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 1be22cd4..516990b3 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/astaxie/beego/session/redis_cluster" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/redis_cluster" +// "github.com/beego/beego/session" // ) // // func init() { @@ -36,8 +36,8 @@ import ( "context" "net/http" - "github.com/astaxie/beego/adapter/session" - cluster "github.com/astaxie/beego/server/web/session/redis_cluster" + "github.com/beego/beego/adapter/session" + cluster "github.com/beego/beego/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 7ab9e7c5..f0033597 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/astaxie/beego/session/redis_sentinel" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/redis_sentinel" +// "github.com/beego/beego/session" // ) // // func init() { @@ -36,9 +36,9 @@ import ( "context" "net/http" - "github.com/astaxie/beego/adapter/session" + "github.com/beego/beego/adapter/session" - sentinel "github.com/astaxie/beego/server/web/session/redis_sentinel" + sentinel "github.com/beego/beego/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 407d32ab..29a84597 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/astaxie/beego/adapter/session" + "github.com/beego/beego/adapter/session" ) func TestRedisSentinel(t *testing.T) { diff --git a/adapter/session/sess_cookie.go b/adapter/session/sess_cookie.go index 3fcbd28e..404b9913 100644 --- a/adapter/session/sess_cookie.go +++ b/adapter/session/sess_cookie.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/server/web/session" ) // CookieSessionStore Cookie SessionStore diff --git a/adapter/session/sess_file.go b/adapter/session/sess_file.go index 2ba33e6d..8b6f3c4a 100644 --- a/adapter/session/sess_file.go +++ b/adapter/session/sess_file.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/server/web/session" ) // FileSessionStore File session store diff --git a/adapter/session/sess_mem.go b/adapter/session/sess_mem.go index febed719..932f7a81 100644 --- a/adapter/session/sess_mem.go +++ b/adapter/session/sess_mem.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/server/web/session" ) // MemSessionStore memory session store. diff --git a/adapter/session/sess_utils.go b/adapter/session/sess_utils.go index 4cfdc760..319eaad8 100644 --- a/adapter/session/sess_utils.go +++ b/adapter/session/sess_utils.go @@ -15,7 +15,7 @@ package session import ( - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/server/web/session" ) // EncodeGob encode the obj to gob diff --git a/adapter/session/session.go b/adapter/session/session.go index 72eeb080..162bb98f 100644 --- a/adapter/session/session.go +++ b/adapter/session/session.go @@ -16,7 +16,7 @@ // // Usage: // import( -// "github.com/astaxie/beego/session" +// "github.com/beego/beego/session" // ) // // func init() { @@ -32,7 +32,7 @@ import ( "net/http" "os" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/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 cd9c4a24..d7d812bd 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/astaxie/beego/adapter/session" + "github.com/beego/beego/adapter/session" - beeSsdb "github.com/astaxie/beego/server/web/session/ssdb" + beeSsdb "github.com/beego/beego/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 70ad83e2..f0db560f 100644 --- a/adapter/session/store_adapter.go +++ b/adapter/session/store_adapter.go @@ -18,7 +18,7 @@ import ( "context" "net/http" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/server/web/session" ) type NewToOldStoreAdapter struct { diff --git a/adapter/swagger/swagger.go b/adapter/swagger/swagger.go index 7a44b770..2b28a791 100644 --- a/adapter/swagger/swagger.go +++ b/adapter/swagger/swagger.go @@ -21,7 +21,7 @@ package swagger import ( - "github.com/astaxie/beego/server/web/swagger" + "github.com/beego/beego/server/web/swagger" ) // Swagger list the resource diff --git a/adapter/template.go b/adapter/template.go index 67f5a33b..249688cc 100644 --- a/adapter/template.go +++ b/adapter/template.go @@ -19,7 +19,7 @@ import ( "io" "net/http" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/server/web" ) // ExecuteTemplate applies the template with name to the specified data object, diff --git a/adapter/templatefunc.go b/adapter/templatefunc.go index 0c805393..f4876a2b 100644 --- a/adapter/templatefunc.go +++ b/adapter/templatefunc.go @@ -19,7 +19,7 @@ import ( "net/url" "time" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/server/web" ) const ( diff --git a/adapter/testing/client.go b/adapter/testing/client.go index 5c138167..bf72d04b 100644 --- a/adapter/testing/client.go +++ b/adapter/testing/client.go @@ -15,7 +15,7 @@ package testing import ( - "github.com/astaxie/beego/client/httplib/testing" + "github.com/beego/beego/client/httplib/testing" ) var port = "" diff --git a/adapter/toolbox/healthcheck.go b/adapter/toolbox/healthcheck.go index cb07e6aa..1c690407 100644 --- a/adapter/toolbox/healthcheck.go +++ b/adapter/toolbox/healthcheck.go @@ -31,7 +31,7 @@ package toolbox import ( - "github.com/astaxie/beego/core/admin" + "github.com/beego/beego/core/admin" ) // AdminCheckList holds health checker map diff --git a/adapter/toolbox/profile.go b/adapter/toolbox/profile.go index 09a97542..1b8fa3dc 100644 --- a/adapter/toolbox/profile.go +++ b/adapter/toolbox/profile.go @@ -19,7 +19,7 @@ import ( "os" "time" - "github.com/astaxie/beego/core/admin" + "github.com/beego/beego/core/admin" ) var startTime = time.Now() diff --git a/adapter/toolbox/statistics.go b/adapter/toolbox/statistics.go index 7c8cd75e..4d7ba6a1 100644 --- a/adapter/toolbox/statistics.go +++ b/adapter/toolbox/statistics.go @@ -17,7 +17,7 @@ package toolbox import ( "time" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/server/web" ) // Statistics struct diff --git a/adapter/toolbox/task.go b/adapter/toolbox/task.go index 7f1bfc45..2dacc17f 100644 --- a/adapter/toolbox/task.go +++ b/adapter/toolbox/task.go @@ -19,7 +19,7 @@ import ( "sort" "time" - "github.com/astaxie/beego/task" + "github.com/beego/beego/task" ) // The bounds for each field. diff --git a/adapter/tree.go b/adapter/tree.go index 36f763ea..e3ac3854 100644 --- a/adapter/tree.go +++ b/adapter/tree.go @@ -15,10 +15,10 @@ package adapter import ( - "github.com/astaxie/beego/adapter/context" - beecontext "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/adapter/context" + beecontext "github.com/beego/beego/server/web/context" - "github.com/astaxie/beego/server/web" + "github.com/beego/beego/server/web" ) // Tree has three elements: FixRouter/wildcard/leaves diff --git a/adapter/utils/caller.go b/adapter/utils/caller.go index 419f11d6..6f8514a6 100644 --- a/adapter/utils/caller.go +++ b/adapter/utils/caller.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) // GetFuncName get function name diff --git a/adapter/utils/captcha/README.md b/adapter/utils/captcha/README.md index dbc2026b..9dd603ac 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/astaxie/beego" - "github.com/astaxie/beego/cache" - "github.com/astaxie/beego/utils/captcha" + "github.com/beego/beego" + "github.com/beego/beego/cache" + "github.com/beego/beego/utils/captcha" ) var cpt *captcha.Captcha diff --git a/adapter/utils/captcha/captcha.go b/adapter/utils/captcha/captcha.go index 71aad0f2..39071639 100644 --- a/adapter/utils/captcha/captcha.go +++ b/adapter/utils/captcha/captcha.go @@ -19,9 +19,9 @@ // package controllers // // import ( -// "github.com/astaxie/beego" -// "github.com/astaxie/beego/cache" -// "github.com/astaxie/beego/utils/captcha" +// "github.com/beego/beego" +// "github.com/beego/beego/cache" +// "github.com/beego/beego/utils/captcha" // ) // // var cpt *captcha.Captcha @@ -63,11 +63,11 @@ import ( "net/http" "time" - "github.com/astaxie/beego/server/web/captcha" - beecontext "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/captcha" + beecontext "github.com/beego/beego/server/web/context" - "github.com/astaxie/beego/adapter/cache" - "github.com/astaxie/beego/adapter/context" + "github.com/beego/beego/adapter/cache" + "github.com/beego/beego/adapter/context" ) var ( diff --git a/adapter/utils/captcha/image.go b/adapter/utils/captcha/image.go index 6a1b696b..542089b7 100644 --- a/adapter/utils/captcha/image.go +++ b/adapter/utils/captcha/image.go @@ -17,7 +17,7 @@ package captcha import ( "io" - "github.com/astaxie/beego/server/web/captcha" + "github.com/beego/beego/server/web/captcha" ) // Image struct diff --git a/adapter/utils/captcha/image_test.go b/adapter/utils/captcha/image_test.go index 5d298573..2a46b58a 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/astaxie/beego/adapter/utils" + "github.com/beego/beego/adapter/utils" ) const ( diff --git a/adapter/utils/debug.go b/adapter/utils/debug.go index 3f4d2759..5159a177 100644 --- a/adapter/utils/debug.go +++ b/adapter/utils/debug.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) // Display print the data in console diff --git a/adapter/utils/file.go b/adapter/utils/file.go index aa9ac316..6ed1b776 100644 --- a/adapter/utils/file.go +++ b/adapter/utils/file.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) // SelfPath gets compiled executable file absolute path diff --git a/adapter/utils/mail.go b/adapter/utils/mail.go index 74a8f403..5c23ad8b 100644 --- a/adapter/utils/mail.go +++ b/adapter/utils/mail.go @@ -17,7 +17,7 @@ package utils import ( "io" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/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 c82c54f9..4409d56f 100644 --- a/adapter/utils/pagination/controller.go +++ b/adapter/utils/pagination/controller.go @@ -15,9 +15,9 @@ package pagination import ( - "github.com/astaxie/beego/adapter/context" - beecontext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/server/web/pagination" + "github.com/beego/beego/adapter/context" + beecontext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/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 9abc6d78..d5d001a3 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/astaxie/beego/utils/pagination" + import "github.com/beego/beego/utils/pagination" type PostsController struct { beego.Controller diff --git a/adapter/utils/pagination/paginator.go b/adapter/utils/pagination/paginator.go index 73d9157f..8b1bf3bf 100644 --- a/adapter/utils/pagination/paginator.go +++ b/adapter/utils/pagination/paginator.go @@ -17,7 +17,7 @@ package pagination import ( "net/http" - "github.com/astaxie/beego/core/utils/pagination" + "github.com/beego/beego/core/utils/pagination" ) // Paginator within the state of a http request. diff --git a/adapter/utils/rand.go b/adapter/utils/rand.go index 0fcca580..42041edb 100644 --- a/adapter/utils/rand.go +++ b/adapter/utils/rand.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) // RandomCreateBytes generate random []byte by specify chars. diff --git a/adapter/utils/safemap.go b/adapter/utils/safemap.go index bb50f3cd..8b49d092 100644 --- a/adapter/utils/safemap.go +++ b/adapter/utils/safemap.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) // BeeMap is a map with lock diff --git a/adapter/utils/slice.go b/adapter/utils/slice.go index 44b782b4..05323890 100644 --- a/adapter/utils/slice.go +++ b/adapter/utils/slice.go @@ -15,7 +15,7 @@ package utils import ( - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) type reducetype func(interface{}) interface{} diff --git a/adapter/utils/utils.go b/adapter/utils/utils.go index 8ba21bc4..58c47da3 100644 --- a/adapter/utils/utils.go +++ b/adapter/utils/utils.go @@ -1,7 +1,7 @@ package utils import ( - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) // GetGOPATHs returns all paths in GOPATH variable. diff --git a/adapter/validation/util.go b/adapter/validation/util.go index 431ce80d..81ff5c9f 100644 --- a/adapter/validation/util.go +++ b/adapter/validation/util.go @@ -17,7 +17,7 @@ package validation import ( "reflect" - "github.com/astaxie/beego/core/validation" + "github.com/beego/beego/core/validation" ) const ( diff --git a/adapter/validation/validation.go b/adapter/validation/validation.go index e90c9f5b..2184e229 100644 --- a/adapter/validation/validation.go +++ b/adapter/validation/validation.go @@ -15,7 +15,7 @@ // Package validation for validations // // import ( -// "github.com/astaxie/beego/validation" +// "github.com/beego/beego/validation" // "log" // ) // @@ -50,7 +50,7 @@ import ( "fmt" "regexp" - "github.com/astaxie/beego/core/validation" + "github.com/beego/beego/core/validation" ) // ValidFormer valid interface diff --git a/adapter/validation/validators.go b/adapter/validation/validators.go index 5cd5d286..e325bf4e 100644 --- a/adapter/validation/validators.go +++ b/adapter/validation/validators.go @@ -17,7 +17,7 @@ package validation import ( "sync" - "github.com/astaxie/beego/core/validation" + "github.com/beego/beego/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 b467760a..1c037c87 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/astaxie/beego/cache + go get github.com/beego/beego/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/astaxie/beego/cache" + "github.com/beego/beego/cache" ) Then init a Cache (example with memory adapter) diff --git a/client/cache/cache.go b/client/cache/cache.go index ddf246ab..d241e517 100644 --- a/client/cache/cache.go +++ b/client/cache/cache.go @@ -16,7 +16,7 @@ // Usage: // // import( -// "github.com/astaxie/beego/cache" +// "github.com/beego/beego/cache" // ) // // bm, err := cache.NewCache("memory", `{"interval":60}`) diff --git a/client/cache/memcache/memcache.go b/client/cache/memcache/memcache.go index 67aedc73..dcc5b017 100644 --- a/client/cache/memcache/memcache.go +++ b/client/cache/memcache/memcache.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/cache/memcache" -// "github.com/astaxie/beego/cache" +// _ "github.com/beego/beego/cache/memcache" +// "github.com/beego/beego/cache" // ) // // bm, err := cache.NewCache("memcache", `{"conn":"127.0.0.1:11211"}`) @@ -39,7 +39,7 @@ import ( "github.com/bradfitz/gomemcache/memcache" - "github.com/astaxie/beego/client/cache" + "github.com/beego/beego/client/cache" ) // Cache Memcache adapter. diff --git a/client/cache/memcache/memcache_test.go b/client/cache/memcache/memcache_test.go index ca86276e..988501aa 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/astaxie/beego/client/cache" + "github.com/beego/beego/client/cache" ) func TestMemcacheCache(t *testing.T) { diff --git a/client/cache/redis/redis.go b/client/cache/redis/redis.go index 34059835..c2817720 100644 --- a/client/cache/redis/redis.go +++ b/client/cache/redis/redis.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/cache/redis" -// "github.com/astaxie/beego/cache" +// _ "github.com/beego/beego/cache/redis" +// "github.com/beego/beego/cache" // ) // // bm, err := cache.NewCache("redis", `{"conn":"127.0.0.1:11211"}`) @@ -40,7 +40,7 @@ import ( "github.com/gomodule/redigo/redis" - "github.com/astaxie/beego/client/cache" + "github.com/beego/beego/client/cache" ) var ( diff --git a/client/cache/redis/redis_test.go b/client/cache/redis/redis_test.go index c8cf0024..30613842 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/astaxie/beego/client/cache" + "github.com/beego/beego/client/cache" ) func TestRedisCache(t *testing.T) { diff --git a/client/cache/ssdb/ssdb.go b/client/cache/ssdb/ssdb.go index 8d9d2b35..0bd92d4a 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/astaxie/beego/client/cache" + "github.com/beego/beego/client/cache" ) // Cache SSDB adapter diff --git a/client/cache/ssdb/ssdb_test.go b/client/cache/ssdb/ssdb_test.go index b23871ca..8fe9e2cf 100644 --- a/client/cache/ssdb/ssdb_test.go +++ b/client/cache/ssdb/ssdb_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/astaxie/beego/client/cache" + "github.com/beego/beego/client/cache" ) func TestSsdbcacheCache(t *testing.T) { diff --git a/client/httplib/README.md b/client/httplib/README.md index 97df8e6b..3a3042da 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/astaxie/beego/httplib" + import "github.com/beego/beego/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/astaxie/beego/httplib](https://godoc.org/github.com/astaxie/beego/httplib) +* [godoc.org/github.com/beego/beego/httplib](https://godoc.org/github.com/beego/beego/httplib) diff --git a/client/httplib/filter/opentracing/filter.go b/client/httplib/filter/opentracing/filter.go index 765a82a9..585419a3 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/astaxie/beego/client/httplib" + "github.com/beego/beego/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 7281f93f..30374814 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/astaxie/beego/client/httplib" + "github.com/beego/beego/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 ce88b70e..b28c2e5c 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/astaxie/beego/client/httplib" + "github.com/beego/beego/client/httplib" ) type FilterChainBuilder struct { diff --git a/client/httplib/filter/prometheus/filter_test.go b/client/httplib/filter/prometheus/filter_test.go index 46edc3d2..091d2ee9 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/astaxie/beego/client/httplib" + "github.com/beego/beego/client/httplib" ) func TestFilterChainBuilder_FilterChain(t *testing.T) { diff --git a/client/httplib/httplib.go b/client/httplib/httplib.go index f8ab80a1..86a6bab5 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/astaxie/beego/httplib" +// import "github.com/beego/beego/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 34e49f2d..db5f69e1 100644 --- a/client/httplib/testing/client.go +++ b/client/httplib/testing/client.go @@ -15,7 +15,7 @@ package testing import ( - "github.com/astaxie/beego/client/httplib" + "github.com/beego/beego/client/httplib" ) var port = "" diff --git a/client/orm/README.md b/client/orm/README.md index 6e808d2a..d3ef8362 100644 --- a/client/orm/README.md +++ b/client/orm/README.md @@ -1,6 +1,6 @@ # beego orm -[![Build Status](https://drone.io/github.com/astaxie/beego/status.png)](https://drone.io/github.com/astaxie/beego/latest) +[![Build Status](https://drone.io/github.com/beego/beego/status.png)](https://drone.io/github.com/beego/beego/latest) A powerful orm framework for go. @@ -27,7 +27,7 @@ more features please read the docs **Install:** - go get github.com/astaxie/beego/orm + go get github.com/beego/beego/orm ## Changelog @@ -45,7 +45,7 @@ package main import ( "fmt" - "github.com/astaxie/beego/orm" + "github.com/beego/beego/orm" _ "github.com/go-sql-driver/mysql" // import your used driver ) diff --git a/client/orm/db.go b/client/orm/db.go index b103d218..651c778b 100644 --- a/client/orm/db.go +++ b/client/orm/db.go @@ -22,7 +22,7 @@ import ( "strings" "time" - "github.com/astaxie/beego/client/orm/hints" + "github.com/beego/beego/client/orm/hints" ) const ( diff --git a/client/orm/db_oracle.go b/client/orm/db_oracle.go index cb0d5052..da693bab 100644 --- a/client/orm/db_oracle.go +++ b/client/orm/db_oracle.go @@ -18,7 +18,7 @@ import ( "fmt" "strings" - "github.com/astaxie/beego/client/orm/hints" + "github.com/beego/beego/client/orm/hints" ) // oracle operators. diff --git a/client/orm/db_sqlite.go b/client/orm/db_sqlite.go index 961f2535..a14b0e20 100644 --- a/client/orm/db_sqlite.go +++ b/client/orm/db_sqlite.go @@ -21,7 +21,7 @@ import ( "strings" "time" - "github.com/astaxie/beego/client/orm/hints" + "github.com/beego/beego/client/orm/hints" ) // sqlite operators. diff --git a/client/orm/do_nothing_orm.go b/client/orm/do_nothing_orm.go index fc5b2159..13e5734c 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/astaxie/beego/core/utils" + "github.com/beego/beego/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 3dac5c74..5b90cfd9 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/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" - "github.com/astaxie/beego/client/orm" - "github.com/astaxie/beego/core/bean" + "github.com/beego/beego/client/orm" + "github.com/beego/beego/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 2a6ed1f4..60ecb346 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/astaxie/beego/client/orm" + "github.com/beego/beego/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 7f9658b4..9079ccc5 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/astaxie/beego/client/orm" + "github.com/beego/beego/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 428dacda..d4a8b551 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/astaxie/beego/client/orm" + "github.com/beego/beego/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 e74e946a..5e950b38 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/astaxie/beego/client/orm" + "github.com/beego/beego/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 72b16038..ddd5d33b 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/astaxie/beego/client/orm" + "github.com/beego/beego/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 9f837cba..98fb23d2 100644 --- a/client/orm/filter_orm_decorator.go +++ b/client/orm/filter_orm_decorator.go @@ -20,7 +20,7 @@ import ( "reflect" "time" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) const ( diff --git a/client/orm/filter_orm_decorator_test.go b/client/orm/filter_orm_decorator_test.go index 671ca001..f3fb8167 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/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" "github.com/stretchr/testify/assert" ) diff --git a/client/orm/hints/db_hints.go b/client/orm/hints/db_hints.go index 7bfe8eb0..9aad7676 100644 --- a/client/orm/hints/db_hints.go +++ b/client/orm/hints/db_hints.go @@ -15,7 +15,7 @@ package hints import ( - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) const ( diff --git a/client/orm/migration/ddl.go b/client/orm/migration/ddl.go index a396d39a..ca670e0b 100644 --- a/client/orm/migration/ddl.go +++ b/client/orm/migration/ddl.go @@ -17,7 +17,7 @@ package migration import ( "fmt" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/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 aeea12c6..924d7afd 100644 --- a/client/orm/migration/migration.go +++ b/client/orm/migration/migration.go @@ -33,8 +33,8 @@ import ( "strings" "time" - "github.com/astaxie/beego/client/orm" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/client/orm" + "github.com/beego/beego/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 7152fada..d64d48d5 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/astaxie/beego/blob/master/orm/models_fields.go#L24-L42") + err = fmt.Errorf("unsupport type custom field, please refer to https://github.com/beego/beego/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 d5aa2fa0..be6d9c26 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/astaxie/beego/client/orm.PostTags)"` + Tags []*Tag `orm:"rel(m2m);rel_through(github.com/beego/beego/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/astaxie/beego/client/orm.GroupPermissions)"` + Groups []*Group `orm:"rel(m2m);rel_through(github.com/beego/beego/client/orm.GroupPermissions)"` } type GroupPermissions struct { @@ -485,7 +485,7 @@ var ( usage: - go get -u github.com/astaxie/beego/client/orm + go get -u github.com/beego/beego/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/astaxie/beego/client/orm + go test -v github.com/beego/beego/client/orm #### Sqlite3 export ORM_DRIVER=sqlite3 export ORM_SOURCE='file:memory_test?mode=memory' - go test -v github.com/astaxie/beego/client/orm + go test -v github.com/beego/beego/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/astaxie/beego/client/orm + go test -v github.com/beego/beego/client/orm #### TiDB export ORM_DRIVER=tidb export ORM_SOURCE='memory://test/test' - go test -v github.com/astaxie/beego/pgk/orm + go test -v github.com/beego/beego/pgk/orm ` ) diff --git a/client/orm/orm.go b/client/orm/orm.go index a83faeb2..f018b06c 100644 --- a/client/orm/orm.go +++ b/client/orm/orm.go @@ -21,7 +21,7 @@ // // import ( // "fmt" -// "github.com/astaxie/beego/client/orm" +// "github.com/beego/beego/client/orm" // _ "github.com/go-sql-driver/mysql" // import your used driver // ) // @@ -62,10 +62,10 @@ import ( "reflect" "time" - "github.com/astaxie/beego/client/orm/hints" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/client/orm/hints" + "github.com/beego/beego/core/utils" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" ) // DebugQueries define the debug diff --git a/client/orm/orm_queryset.go b/client/orm/orm_queryset.go index ed223e24..e3fed428 100644 --- a/client/orm/orm_queryset.go +++ b/client/orm/orm_queryset.go @@ -18,7 +18,7 @@ import ( "context" "fmt" - "github.com/astaxie/beego/client/orm/hints" + "github.com/beego/beego/client/orm/hints" ) type colValue struct { diff --git a/client/orm/orm_test.go b/client/orm/orm_test.go index 46863190..f4d477b1 100644 --- a/client/orm/orm_test.go +++ b/client/orm/orm_test.go @@ -31,7 +31,7 @@ import ( "testing" "time" - "github.com/astaxie/beego/client/orm/hints" + "github.com/beego/beego/client/orm/hints" "github.com/stretchr/testify/assert" ) diff --git a/client/orm/types.go b/client/orm/types.go index 34c61d51..ae9c4086 100644 --- a/client/orm/types.go +++ b/client/orm/types.go @@ -20,7 +20,7 @@ import ( "reflect" "time" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) // TableNaming is usually used by model diff --git a/client/orm/utils_test.go b/client/orm/utils_test.go index fa75258a..7d94cada 100644 --- a/client/orm/utils_test.go +++ b/client/orm/utils_test.go @@ -67,4 +67,4 @@ func TestSnakeStringWithAcronym(t *testing.T) { t.Error("Unit Test Fail:", v, res, answer[v]) } } -} \ No newline at end of file +} diff --git a/core/admin/profile.go b/core/admin/profile.go index 1e4e4953..1c124cac 100644 --- a/core/admin/profile.go +++ b/core/admin/profile.go @@ -26,7 +26,7 @@ import ( "strconv" "time" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/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 b88a42ff..a0d56867 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/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" ) const DefaultValueTagKey = "default" diff --git a/core/config/config.go b/core/config/config.go index a4a24fff..e5471b4a 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/astaxie/beego/config" +// import "github.com/beego/beego/config" // Examples. // // cnf, err := config.NewConfig("ini", "config.conf") diff --git a/core/config/env/env.go b/core/config/env/env.go index d3903d74..171f9c20 100644 --- a/core/config/env/env.go +++ b/core/config/env/env.go @@ -21,7 +21,7 @@ import ( "os" "strings" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) var env *utils.BeeMap diff --git a/core/config/etcd/config.go b/core/config/etcd/config.go index 6c3d33d4..57a33b0d 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/astaxie/beego/core/config" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/config" + "github.com/beego/beego/core/logs" ) type EtcdConfiger struct { diff --git a/core/config/global.go b/core/config/global.go index a7fb795f..91571b21 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/astaxie/beego/core/config/etcd" +// e.g. _ import "github.com/beego/beego/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 70d00980..03e1cc89 100644 --- a/core/config/ini.go +++ b/core/config/ini.go @@ -30,7 +30,7 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" ) var ( diff --git a/core/config/json/json.go b/core/config/json/json.go index 672d2787..455952fb 100644 --- a/core/config/json/json.go +++ b/core/config/json/json.go @@ -26,8 +26,8 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/astaxie/beego/core/config" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/config" + "github.com/beego/beego/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 386cfdf1..4e9b1e60 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/astaxie/beego/core/config" + "github.com/beego/beego/core/config" ) func TestJsonStartsWithArray(t *testing.T) { diff --git a/core/config/toml/toml.go b/core/config/toml/toml.go index 96e1a200..e0c6ed2c 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/astaxie/beego/core/config" + "github.com/beego/beego/core/config" ) const keySeparator = "." diff --git a/core/config/toml/toml_test.go b/core/config/toml/toml_test.go index 20726f0d..629cbeb4 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/astaxie/beego/core/config" + "github.com/beego/beego/core/config" ) func TestConfig_Parse(t *testing.T) { diff --git a/core/config/xml/xml.go b/core/config/xml/xml.go index 70f0c23c..38c9f6d3 100644 --- a/core/config/xml/xml.go +++ b/core/config/xml/xml.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/config/xml" -// "github.com/astaxie/beego/config" +// _ "github.com/beego/beego/config/xml" +// "github.com/beego/beego/config" // ) // // cnf, err := config.NewConfig("xml", "config.xml") @@ -41,8 +41,8 @@ import ( "github.com/mitchellh/mapstructure" - "github.com/astaxie/beego/core/config" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/config" + "github.com/beego/beego/core/logs" "github.com/beego/x2j" ) diff --git a/core/config/xml/xml_test.go b/core/config/xml/xml_test.go index c6cf970d..0a001891 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/astaxie/beego/core/config" + "github.com/beego/beego/core/config" ) func TestXML(t *testing.T) { diff --git a/core/config/yaml/yaml.go b/core/config/yaml/yaml.go index 71daabee..ec50c77e 100644 --- a/core/config/yaml/yaml.go +++ b/core/config/yaml/yaml.go @@ -20,8 +20,8 @@ // // Usage: // import( -// _ "github.com/astaxie/beego/config/yaml" -// "github.com/astaxie/beego/config" +// _ "github.com/beego/beego/config/yaml" +// "github.com/beego/beego/config" // ) // // cnf, err := config.NewConfig("yaml", "config.yaml") @@ -43,8 +43,8 @@ import ( "github.com/beego/goyaml2" "gopkg.in/yaml.v2" - "github.com/astaxie/beego/core/config" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/config" + "github.com/beego/beego/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 d18317db..f2d60762 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/astaxie/beego/core/config" + "github.com/beego/beego/core/config" ) func TestYaml(t *testing.T) { diff --git a/core/logs/README.md b/core/logs/README.md index c05bcc04..660b1fe1 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/astaxie/beego/logs + go get github.com/beego/beego/logs ## What adapters are supported? @@ -18,7 +18,7 @@ First you must import it ```golang import ( - "github.com/astaxie/beego/logs" + "github.com/beego/beego/logs" ) ``` diff --git a/core/logs/alils/alils.go b/core/logs/alils/alils.go index 484d31e4..832d5425 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/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" ) const ( diff --git a/core/logs/es/es.go b/core/logs/es/es.go index 6175f253..6eee6eae 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/astaxie/beego/core/logs" + "github.com/beego/beego/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/astaxie/beego/logs/es" +// import _ "github.com/beego/beego/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 0dafef4c..b695ba7a 100644 --- a/core/logs/es/index.go +++ b/core/logs/es/index.go @@ -17,7 +17,7 @@ package es import ( "fmt" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" ) // IndexNaming generate the index name diff --git a/core/logs/es/index_test.go b/core/logs/es/index_test.go index 03e7a911..1d820129 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/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" ) func TestDefaultIndexNaming_IndexName(t *testing.T) { diff --git a/core/logs/log.go b/core/logs/log.go index 2c1b4dd1..1cb62a52 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/astaxie/beego/logs" +// import "github.com/beego/beego/logs" // // log := NewLogger(10000) // log.SetLogger("console", "") diff --git a/core/utils/pagination/doc.go b/core/utils/pagination/doc.go index b9c604b9..e366b225 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/astaxie/beego/core/utils/pagination" + import "github.com/beego/beego/core/utils/pagination" type PostsController struct { beego.Controller diff --git a/core/validation/README.md b/core/validation/README.md index 43373e47..80085f2c 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/astaxie/beego/validation + go get github.com/beego/beego/validation Test: - go test github.com/astaxie/beego/validation + go test github.com/beego/beego/validation ## Example Direct Use: import ( - "github.com/astaxie/beego/validation" + "github.com/beego/beego/validation" "log" ) @@ -49,7 +49,7 @@ Direct Use: Struct Tag Use: import ( - "github.com/astaxie/beego/validation" + "github.com/beego/beego/validation" ) // validation function follow with "valid" tag @@ -81,7 +81,7 @@ Struct Tag Use: Use custom function: import ( - "github.com/astaxie/beego/validation" + "github.com/beego/beego/validation" ) type user struct { diff --git a/core/validation/validation.go b/core/validation/validation.go index 134e750e..715ab2c9 100644 --- a/core/validation/validation.go +++ b/core/validation/validation.go @@ -15,7 +15,7 @@ // Package validation for validations // // import ( -// "github.com/astaxie/beego/validation" +// "github.com/beego/beego/validation" // "log" // ) // diff --git a/core/validation/validators.go b/core/validation/validators.go index ec422d86..c7d60baf 100644 --- a/core/validation/validators.go +++ b/core/validation/validators.go @@ -23,7 +23,7 @@ import ( "time" "unicode/utf8" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/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 7527aa47..4c6d7f41 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,5 @@ -module github.com/astaxie/beego +//module github.com/beego/beego +module github.com/beego/beego require ( github.com/Knetic/govaluate v3.0.0+incompatible // indirect diff --git a/server/web/LICENSE b/server/web/LICENSE index 5dbd4243..26050108 100644 --- a/server/web/LICENSE +++ b/server/web/LICENSE @@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +limitations under the License. diff --git a/server/web/admin.go b/server/web/admin.go index 1b06f486..4c06aa7a 100644 --- a/server/web/admin.go +++ b/server/web/admin.go @@ -20,7 +20,7 @@ import ( "reflect" "time" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/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 60296976..a4407ba9 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/astaxie/beego/core/admin" + "github.com/beego/beego/core/admin" ) type adminController struct { diff --git a/server/web/admin_test.go b/server/web/admin_test.go index 9ab11ee3..cf8104c1 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/astaxie/beego/core/admin" + "github.com/beego/beego/core/admin" ) type SampleDatabaseCheck struct { diff --git a/server/web/captcha/README.md b/server/web/captcha/README.md index dbc2026b..9dd603ac 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/astaxie/beego" - "github.com/astaxie/beego/cache" - "github.com/astaxie/beego/utils/captcha" + "github.com/beego/beego" + "github.com/beego/beego/cache" + "github.com/beego/beego/utils/captcha" ) var cpt *captcha.Captcha diff --git a/server/web/captcha/captcha.go b/server/web/captcha/captcha.go index 8ce832f7..b46eae5c 100644 --- a/server/web/captcha/captcha.go +++ b/server/web/captcha/captcha.go @@ -19,9 +19,9 @@ // package controllers // // import ( -// "github.com/astaxie/beego" -// "github.com/astaxie/beego/cache" -// "github.com/astaxie/beego/utils/captcha" +// "github.com/beego/beego" +// "github.com/beego/beego/cache" +// "github.com/beego/beego/utils/captcha" // ) // // var cpt *captcha.Captcha @@ -67,11 +67,11 @@ import ( "strings" "time" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" - "github.com/astaxie/beego/core/utils" - "github.com/astaxie/beego/server/web" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/core/utils" + "github.com/beego/beego/server/web" + "github.com/beego/beego/server/web/context" ) var ( diff --git a/server/web/captcha/image_test.go b/server/web/captcha/image_test.go index 4b4518a1..a65a74c5 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/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) type byteCounter struct { diff --git a/server/web/config.go b/server/web/config.go index 10138e63..7032d6ba 100644 --- a/server/web/config.go +++ b/server/web/config.go @@ -23,13 +23,13 @@ import ( "runtime" "strings" - "github.com/astaxie/beego" - "github.com/astaxie/beego/core/config" - "github.com/astaxie/beego/core/logs" - "github.com/astaxie/beego/server/web/session" + "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/astaxie/beego/core/utils" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/core/utils" + "github.com/beego/beego/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 0129ebb4..63ea842b 100644 --- a/server/web/config_test.go +++ b/server/web/config_test.go @@ -19,7 +19,7 @@ import ( "reflect" "testing" - beeJson "github.com/astaxie/beego/core/config/json" + beeJson "github.com/beego/beego/core/config/json" ) func TestDefaults(t *testing.T) { diff --git a/server/web/context/context.go b/server/web/context/context.go index 930c14a4..246310eb 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/astaxie/beego/context" +// import "github.com/beego/beego/context" // // ctx := context.Context{Request:req,ResponseWriter:rw} // @@ -35,7 +35,7 @@ import ( "strings" "time" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) // Commonly used mime-types diff --git a/server/web/context/input.go b/server/web/context/input.go index 504838a3..b09d9895 100644 --- a/server/web/context/input.go +++ b/server/web/context/input.go @@ -29,7 +29,7 @@ import ( "strings" "sync" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/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 fe3388b6..6ba6a075 100644 --- a/server/web/context/param/conv.go +++ b/server/web/context/param/conv.go @@ -4,8 +4,8 @@ import ( "fmt" "reflect" - "github.com/astaxie/beego/core/logs" - beecontext "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/core/logs" + beecontext "github.com/beego/beego/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 f363c655..f96ad663 100644 --- a/server/web/controller.go +++ b/server/web/controller.go @@ -29,10 +29,10 @@ import ( "strconv" "strings" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/server/web/session" - "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/server/web/context/param" + "github.com/beego/beego/server/web/context" + "github.com/beego/beego/server/web/context/param" ) var ( diff --git a/server/web/controller_test.go b/server/web/controller_test.go index 0b711e0d..020c8335 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/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) func TestGetInt(t *testing.T) { diff --git a/server/web/doc.go b/server/web/doc.go index a32bc576..7e1c6966 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/astaxie/beego" + import "github.com/beego/beego" func main() { beego.Run() diff --git a/server/web/error.go b/server/web/error.go index b5ef1d2d..14cf8919 100644 --- a/server/web/error.go +++ b/server/web/error.go @@ -23,10 +23,10 @@ import ( "strconv" "strings" - "github.com/astaxie/beego" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego" + "github.com/beego/beego/core/utils" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) const ( diff --git a/server/web/filter.go b/server/web/filter.go index 967de8c9..33464f86 100644 --- a/server/web/filter.go +++ b/server/web/filter.go @@ -17,7 +17,7 @@ package web import ( "strings" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/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 58153f1d..9b7cbdf9 100644 --- a/server/web/filter/apiauth/apiauth.go +++ b/server/web/filter/apiauth/apiauth.go @@ -16,8 +16,8 @@ // // Simple Usage: // import( -// "github.com/astaxie/beego" -// "github.com/astaxie/beego/plugins/apiauth" +// "github.com/beego/beego" +// "github.com/beego/beego/plugins/apiauth" // ) // // func main(){ @@ -65,8 +65,8 @@ import ( "sort" "time" - "github.com/astaxie/beego/server/web" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web" + "github.com/beego/beego/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 ee6af6c3..b0f938e4 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/astaxie/beego" -// "github.com/astaxie/beego/plugins/auth" +// "github.com/beego/beego" +// "github.com/beego/beego/plugins/auth" // ) // // func main(){ @@ -40,8 +40,8 @@ import ( "net/http" "strings" - "github.com/astaxie/beego/server/web" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web" + "github.com/beego/beego/server/web/context" ) var defaultRealm = "Authorization Required" diff --git a/server/web/filter/authz/authz.go b/server/web/filter/authz/authz.go index 857c52f2..9c4495b8 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/astaxie/beego" -// "github.com/astaxie/beego/plugins/authz" +// "github.com/beego/beego" +// "github.com/beego/beego/plugins/authz" // "github.com/casbin/casbin" // ) // @@ -44,8 +44,8 @@ import ( "github.com/casbin/casbin" - "github.com/astaxie/beego/server/web" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web" + "github.com/beego/beego/server/web/context" ) // NewAuthorizer returns the authorizer. diff --git a/server/web/filter/authz/authz_model.conf b/server/web/filter/authz/authz_model.conf index d1b3dbd7..fd2f08df 100644 --- a/server/web/filter/authz/authz_model.conf +++ b/server/web/filter/authz/authz_model.conf @@ -11,4 +11,4 @@ g = _, _ e = some(where (p.eft == allow)) [matchers] -m = g(r.sub, p.sub) && keyMatch(r.obj, p.obj) && (r.act == p.act || p.act == "*") \ No newline at end of file +m = g(r.sub, p.sub) && keyMatch(r.obj, p.obj) && (r.act == p.act || p.act == "*") diff --git a/server/web/filter/authz/authz_policy.csv b/server/web/filter/authz/authz_policy.csv index c062dd3e..9203e11f 100644 --- a/server/web/filter/authz/authz_policy.csv +++ b/server/web/filter/authz/authz_policy.csv @@ -4,4 +4,4 @@ p, bob, /dataset2/resource1, * p, bob, /dataset2/resource2, GET p, bob, /dataset2/folder1/*, POST p, dataset1_admin, /dataset1/*, * -g, cathy, dataset1_admin \ No newline at end of file +g, cathy, dataset1_admin diff --git a/server/web/filter/authz/authz_test.go b/server/web/filter/authz/authz_test.go index c0d0dde5..b2500fab 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/astaxie/beego/server/web" - "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/server/web/filter/auth" + "github.com/beego/beego/server/web" + "github.com/beego/beego/server/web/context" + "github.com/beego/beego/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 3a6905ea..a5a062c0 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/astaxie/beego" -// "github.com/astaxie/beego/plugins/cors" +// "github.com/beego/beego" +// "github.com/beego/beego/plugins/cors" // ) // // func main() { @@ -42,8 +42,8 @@ import ( "strings" "time" - "github.com/astaxie/beego/server/web" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web" + "github.com/beego/beego/server/web/context" ) const ( diff --git a/server/web/filter/cors/cors_test.go b/server/web/filter/cors/cors_test.go index 7649de25..ea797770 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/astaxie/beego/server/web" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web" + "github.com/beego/beego/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 c2defa18..a76be7d2 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/astaxie/beego/server/web" - beegoCtx "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web" + beegoCtx "github.com/beego/beego/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 d7222c37..5064ce10 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/astaxie/beego/server/web/context" + "github.com/beego/beego/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 7daabd5a..fe724f83 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/astaxie/beego" - "github.com/astaxie/beego/server/web" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego" + "github.com/beego/beego/server/web" + "github.com/beego/beego/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 cb133a64..62dc23b0 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/astaxie/beego/server/web/context" + "github.com/beego/beego/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 e175ab29..77918af1 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/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) func TestControllerRegister_InsertFilterChain(t *testing.T) { diff --git a/server/web/filter_test.go b/server/web/filter_test.go index 11f575d6..fa2f4328 100644 --- a/server/web/filter_test.go +++ b/server/web/filter_test.go @@ -19,7 +19,7 @@ import ( "net/http/httptest" "testing" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) var FilterUser = func(ctx *context.Context) { diff --git a/server/web/grace/grace.go b/server/web/grace/grace.go index fb0cb7bb..3e396ea8 100644 --- a/server/web/grace/grace.go +++ b/server/web/grace/grace.go @@ -22,7 +22,7 @@ // "net/http" // "os" // -// "github.com/astaxie/beego/grace" +// "github.com/beego/beego/grace" // ) // // func handler(w http.ResponseWriter, r *http.Request) { diff --git a/server/web/hooks.go b/server/web/hooks.go index 58e2c0f3..4f2b776b 100644 --- a/server/web/hooks.go +++ b/server/web/hooks.go @@ -6,9 +6,9 @@ import ( "net/http" "path/filepath" - "github.com/astaxie/beego/core/logs" - "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/core/logs" + "github.com/beego/beego/server/web/context" + "github.com/beego/beego/server/web/session" ) // register MIME type with content type diff --git a/server/web/namespace.go b/server/web/namespace.go index 58afb6c7..263323bb 100644 --- a/server/web/namespace.go +++ b/server/web/namespace.go @@ -18,7 +18,7 @@ import ( "net/http" "strings" - beecontext "github.com/astaxie/beego/server/web/context" + beecontext "github.com/beego/beego/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/astaxie/beego#Router +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#AutoRouter +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#AutoPrefix +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Get +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Post +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Delete +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Put +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Head +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Options +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Patch +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Any +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Handler +// refer: https://godoc.org/github.com/beego/beego#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/astaxie/beego#Include +// refer: https://godoc.org/github.com/beego/beego#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 a6f87bba..eba9bb8a 100644 --- a/server/web/namespace_test.go +++ b/server/web/namespace_test.go @@ -20,7 +20,7 @@ import ( "strconv" "testing" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) func TestNamespaceGet(t *testing.T) { diff --git a/server/web/pagination/controller.go b/server/web/pagination/controller.go index f6b2f73d..6b9717c0 100644 --- a/server/web/pagination/controller.go +++ b/server/web/pagination/controller.go @@ -15,8 +15,8 @@ package pagination import ( - "github.com/astaxie/beego/core/utils/pagination" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/core/utils/pagination" + "github.com/beego/beego/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 c3434501..e1ebd558 100644 --- a/server/web/parser.go +++ b/server/web/parser.go @@ -30,17 +30,17 @@ import ( "golang.org/x/tools/go/packages" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" - "github.com/astaxie/beego/core/utils" - "github.com/astaxie/beego/server/web/context/param" + "github.com/beego/beego/core/utils" + "github.com/beego/beego/server/web/context/param" ) var globalRouterTemplate = `package {{.routersDir}} import ( - beego "github.com/astaxie/beego/server/web" - "github.com/astaxie/beego/server/web/context/param"{{.globalimport}} + beego "github.com/beego/beego/server/web" + "github.com/beego/beego/server/web/context/param"{{.globalimport}} ) func init() { diff --git a/server/web/policy.go b/server/web/policy.go index 14673422..7cde1391 100644 --- a/server/web/policy.go +++ b/server/web/policy.go @@ -17,7 +17,7 @@ package web import ( "strings" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/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 d729013b..868a7631 100644 --- a/server/web/router.go +++ b/server/web/router.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" - "github.com/astaxie/beego/core/utils" - beecontext "github.com/astaxie/beego/server/web/context" - "github.com/astaxie/beego/server/web/context/param" + "github.com/beego/beego/core/utils" + beecontext "github.com/beego/beego/server/web/context" + "github.com/beego/beego/server/web/context/param" ) // default filter execution points diff --git a/server/web/router_test.go b/server/web/router_test.go index 59ccd1fc..3b69619a 100644 --- a/server/web/router_test.go +++ b/server/web/router_test.go @@ -21,9 +21,9 @@ import ( "strings" "testing" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) type TestController struct { diff --git a/server/web/server.go b/server/web/server.go index 25841563..88225527 100644 --- a/server/web/server.go +++ b/server/web/server.go @@ -31,11 +31,11 @@ import ( "golang.org/x/crypto/acme/autocert" - "github.com/astaxie/beego/core/logs" - beecontext "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/core/logs" + beecontext "github.com/beego/beego/server/web/context" - "github.com/astaxie/beego/core/utils" - "github.com/astaxie/beego/server/web/grace" + "github.com/beego/beego/core/utils" + "github.com/beego/beego/server/web/grace" ) var ( diff --git a/server/web/session/README.md b/server/web/session/README.md index a5c3bd6d..f59ad10e 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/astaxie/beego/session + go get github.com/beego/beego/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/astaxie/beego/session" + "github.com/beego/beego/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 7f15956a..4768ae53 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/astaxie/beego/session/couchbase" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/couchbase" +// "github.com/beego/beego/session" // ) // // func init() { @@ -41,7 +41,7 @@ import ( couchbase "github.com/couchbase/go-couchbase" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/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 5b930fcd..7ebc0c8c 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/astaxie/beego/server/web/session" + "github.com/beego/beego/server/web/session" ) var ( diff --git a/server/web/session/memcache/sess_memcache.go b/server/web/session/memcache/sess_memcache.go index 168116ef..fe33dd6f 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/astaxie/beego/session/memcache" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/memcache" +// "github.com/beego/beego/session" // ) // // func init() { @@ -38,7 +38,7 @@ import ( "strings" "sync" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/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 89da361d..91915b2c 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/astaxie/beego/session/mysql" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/mysql" +// "github.com/beego/beego/session" // ) // // func init() { @@ -47,7 +47,7 @@ import ( "sync" "time" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/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 a83ac083..96379155 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/astaxie/beego/session/postgresql" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/postgresql" +// "github.com/beego/beego/session" // ) // // func init() { @@ -57,7 +57,7 @@ import ( "sync" "time" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/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 c6e3bcbb..56afb6c2 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/astaxie/beego/session/redis" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/redis" +// "github.com/beego/beego/session" // ) // // func init() { @@ -43,7 +43,7 @@ import ( "github.com/go-redis/redis/v7" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/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 64dbc9f9..1ef38d81 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/astaxie/beego/server/web/session" + "github.com/beego/beego/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 d2971e71..b6de55c3 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/astaxie/beego/session/redis_cluster" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/redis_cluster" +// "github.com/beego/beego/session" // ) // // func init() { @@ -43,7 +43,7 @@ import ( rediss "github.com/go-redis/redis/v7" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/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 89d73b86..0f1030bd 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/astaxie/beego/session/redis_sentinel" -// "github.com/astaxie/beego/session" +// _ "github.com/beego/beego/session/redis_sentinel" +// "github.com/beego/beego/session" // ) // // func init() { @@ -43,7 +43,7 @@ import ( "github.com/go-redis/redis/v7" - "github.com/astaxie/beego/server/web/session" + "github.com/beego/beego/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 f052a14a..d786adbb 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/astaxie/beego/server/web/session" + "github.com/beego/beego/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 8a031dd5..4eed6154 100644 --- a/server/web/session/sess_utils.go +++ b/server/web/session/sess_utils.go @@ -29,7 +29,7 @@ import ( "strconv" "time" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) func init() { diff --git a/server/web/session/session.go b/server/web/session/session.go index 60fc0e00..5975638f 100644 --- a/server/web/session/session.go +++ b/server/web/session/session.go @@ -16,7 +16,7 @@ // // Usage: // import( -// "github.com/astaxie/beego/session" +// "github.com/beego/beego/session" // ) // // func init() { diff --git a/server/web/session/ssdb/sess_ssdb.go b/server/web/session/ssdb/sess_ssdb.go index 0adc41bd..8d0d20e0 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/astaxie/beego/server/web/session" + "github.com/beego/beego/server/web/session" ) var ssdbProvider = &Provider{} diff --git a/server/web/staticfile.go b/server/web/staticfile.go index aa3f35d8..07302e98 100644 --- a/server/web/staticfile.go +++ b/server/web/staticfile.go @@ -26,10 +26,10 @@ import ( "sync" "time" - "github.com/astaxie/beego/core/logs" + "github.com/beego/beego/core/logs" lru "github.com/hashicorp/golang-lru" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/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 98f85e96..5aa7747c 100644 --- a/server/web/statistics.go +++ b/server/web/statistics.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" ) // Statistics struct diff --git a/server/web/template.go b/server/web/template.go index d582dcda..6c808019 100644 --- a/server/web/template.go +++ b/server/web/template.go @@ -27,8 +27,8 @@ import ( "strings" "sync" - "github.com/astaxie/beego/core/logs" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/logs" + "github.com/beego/beego/core/utils" ) var ( diff --git a/server/web/template_test.go b/server/web/template_test.go index b542494d..1de04819 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/astaxie/beego/test" + "github.com/beego/beego/test" ) var header = `{{define "header"}} diff --git a/server/web/tree.go b/server/web/tree.go index fc5a11a2..7a62ebfc 100644 --- a/server/web/tree.go +++ b/server/web/tree.go @@ -19,9 +19,9 @@ import ( "regexp" "strings" - "github.com/astaxie/beego/core/utils" + "github.com/beego/beego/core/utils" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) var ( diff --git a/server/web/tree_test.go b/server/web/tree_test.go index 2c41a227..09826bc2 100644 --- a/server/web/tree_test.go +++ b/server/web/tree_test.go @@ -18,7 +18,7 @@ import ( "strings" "testing" - "github.com/astaxie/beego/server/web/context" + "github.com/beego/beego/server/web/context" ) type testInfo struct { @@ -93,7 +93,7 @@ func init() { //not match example - // https://github.com/astaxie/beego/issues/3865 + // https://github.com/beego/beego/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")) @@ -336,4 +336,4 @@ func TestSplitSegment(t *testing.T) { t.Fatalf("%s should return %t,%s,%q, got %t,%s,%q", pattern, v.isReg, v.params, v.regStr, b, w, r) } } -} \ No newline at end of file +} diff --git a/task/govenor_command.go b/task/govenor_command.go index 8dd92b67..d08b12d3 100644 --- a/task/govenor_command.go +++ b/task/govenor_command.go @@ -21,7 +21,7 @@ import ( "github.com/pkg/errors" - "github.com/astaxie/beego/core/admin" + "github.com/beego/beego/core/admin" ) type listTaskCommand struct { diff --git a/test/Makefile b/test/Makefile index e80e8238..7483cf05 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,2 +1,2 @@ build_view: - $(GOPATH)/bin/go-bindata-assetfs -pkg testdata views/... \ No newline at end of file + $(GOPATH)/bin/go-bindata-assetfs -pkg testdata views/... diff --git a/test/views/blocks/block.tpl b/test/views/blocks/block.tpl index 2a9c57fc..bd4cf960 100644 --- a/test/views/blocks/block.tpl +++ b/test/views/blocks/block.tpl @@ -1,3 +1,3 @@ {{define "block"}}

Hello, blocks!

-{{end}} \ No newline at end of file +{{end}} diff --git a/test/views/header.tpl b/test/views/header.tpl index 041fa403..0d36989e 100644 --- a/test/views/header.tpl +++ b/test/views/header.tpl @@ -1,3 +1,3 @@ {{define "header"}}

Hello, astaxie!

-{{end}} \ No newline at end of file +{{end}}