Merge pull request #28 from flycash/txn

flycash · web-flow · commit 0513eee43ffb · 2020-12-14T12:01:01.000+08:00
using beego v2
diff --git a/cache/file/main.go b/cache/file/main.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/beego/beego/client/cache"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/cache"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 func main() {
diff --git a/cache/memory/main.go b/cache/memory/main.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/beego/beego/client/cache"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/cache"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 func main() {
diff --git a/cache/memorycache/main.go b/cache/memorycache/main.go
@@ -18,11 +18,11 @@ import (
 	"context"
 	"time"
 
-	"github.com/beego/beego/client/cache"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/cache"
+	"github.com/beego/beego/v2/core/logs"
 
 	// don't forget this
-	_ "github.com/beego/beego/client/cache/memcache"
+	_ "github.com/beego/beego/v2/client/cache/memcache"
 )
 
 func main() {
diff --git a/cache/redis/main.go b/cache/redis/main.go
@@ -18,10 +18,10 @@ import (
 	"context"
 	"time"
 
-	"github.com/beego/beego/client/cache"
+	"github.com/beego/beego/v2/client/cache"
 	// don't forget this
-	_ "github.com/beego/beego/client/cache/redis"
-	"github.com/beego/beego/core/logs"
+	_ "github.com/beego/beego/v2/client/cache/redis"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 func main() {
diff --git a/captcha/main.go b/captcha/main.go
@@ -15,10 +15,10 @@
 package main
 
 import (
-	beego "github.com/beego/beego/adapter"
-	"github.com/beego/beego/client/cache"
-	"github.com/beego/beego/core/logs"
-	"github.com/beego/beego/server/web/captcha"
+	beego "github.com/beego/beego/v2/adapter"
+	"github.com/beego/beego/v2/client/cache"
+	"github.com/beego/beego/v2/core/logs"
+	"github.com/beego/beego/v2/server/web/captcha"
 )
 
 // init captcha
diff --git a/config/loadConfig/main.go b/config/loadConfig/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/beego/beego/core/logs"
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/core/logs"
+	"github.com/beego/beego/v2/server/web"
 )
 
 var (
diff --git a/config/webAutoLoadConfig/main.go b/config/webAutoLoadConfig/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/beego/beego/core/logs"
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/core/logs"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/beego-dev/beego-example
 go 1.13
 
 require (
-	github.com/beego/beego v1.12.4-0.20201213162117-e2a859d1564a
+	github.com/beego/beego/v2 v2.0.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/lib/pq v1.0.0
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible
diff --git a/httplib/basic/main.go b/httplib/basic/main.go
@@ -17,8 +17,8 @@ package main
 import (
 	"crypto/tls"
 
-	"github.com/beego/beego/client/httplib"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/httplib"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 func main() {
diff --git a/httplib/debug/main.go b/httplib/debug/main.go
@@ -15,8 +15,8 @@
 package main
 
 import (
-	"github.com/beego/beego/client/httplib"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/httplib"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 func main() {
diff --git a/httplib/file/main.go b/httplib/file/main.go
@@ -17,8 +17,8 @@ package main
 import (
 	"io/ioutil"
 
-	"github.com/beego/beego/client/httplib"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/httplib"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 func main() {
diff --git a/httplib/filter/custom/main.go b/httplib/filter/custom/main.go
@@ -19,8 +19,8 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/beego/beego/client/httplib"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/httplib"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 // implement custom filter
diff --git a/httplib/filter/opentracing/main.go b/httplib/filter/opentracing/main.go
@@ -15,9 +15,9 @@
 package main
 
 import (
-	"github.com/beego/beego/client/httplib"
-	"github.com/beego/beego/client/httplib/filter/opentracing"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/httplib"
+	"github.com/beego/beego/v2/client/httplib/filter/opentracing"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 func main() {
diff --git a/httplib/filter/prometheus/main.go b/httplib/filter/prometheus/main.go
@@ -15,9 +15,9 @@
 package main
 
 import (
-	"github.com/beego/beego/client/httplib"
-	"github.com/beego/beego/client/httplib/filter/prometheus"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/httplib"
+	"github.com/beego/beego/v2/client/httplib/filter/prometheus"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 func main() {
diff --git a/httplib/header/main.go b/httplib/header/main.go
@@ -15,8 +15,8 @@
 package main
 
 import (
-	"github.com/beego/beego/client/httplib"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/httplib"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 func main() {
diff --git a/httplib/timeout/main.go b/httplib/timeout/main.go
@@ -17,8 +17,8 @@ package main
 import (
 	"time"
 
-	"github.com/beego/beego/client/httplib"
-	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/v2/client/httplib"
+	"github.com/beego/beego/v2/core/logs"
 )
 
 func main() {
diff --git a/httpserver/basic/main.go b/httpserver/basic/main.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/controller/error/abort/main.go b/httpserver/controller/error/abort/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/controller/error/customize/main.go b/httpserver/controller/error/customize/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 type ErrorController struct {
diff --git a/httpserver/controller/error/errorpage/main.go b/httpserver/controller/error/errorpage/main.go
@@ -4,7 +4,7 @@ import (
 	"html/template"
 	"net/http"
 
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func serverError(rw http.ResponseWriter, r *http.Request) {
diff --git a/httpserver/controller/error/redirect/main.go b/httpserver/controller/error/redirect/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"net/http"
 
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/controller/request/body/main.go b/httpserver/controller/request/body/main.go
@@ -17,7 +17,7 @@ package main
 import (
 	"encoding/json"
 
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/controller/request/data-binding/main.go b/httpserver/controller/request/data-binding/main.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/controller/request/form-data/main.go b/httpserver/controller/request/form-data/main.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/controller/request/query/main.go b/httpserver/controller/request/query/main.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/controller/request/router-params/main.go b/httpserver/controller/request/router-params/main.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/controller/request/upload/main.go b/httpserver/controller/request/upload/main.go
@@ -15,8 +15,8 @@
 package main
 
 import (
-	"github.com/beego/beego/core/logs"
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/core/logs"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/controller/validation/main.go b/httpserver/controller/validation/main.go
@@ -18,8 +18,8 @@ import (
 	"encoding/json"
 	"strings"
 
-	"github.com/beego/beego/core/validation"
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/core/validation"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/cookie/main.go b/httpserver/cookie/main.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 // to test this
diff --git a/httpserver/download/main.go b/httpserver/download/main.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/filter/basic/main.go b/httpserver/filter/basic/main.go
@@ -17,8 +17,8 @@ package main
 import (
 	"fmt"
 
-	"github.com/beego/beego/server/web"
-	"github.com/beego/beego/server/web/context"
+	"github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/context"
 )
 
 func main() {
diff --git a/httpserver/filter/filter_chain/main.go b/httpserver/filter/filter_chain/main.go
@@ -15,9 +15,9 @@
 package main
 
 import (
-	"github.com/beego/beego/core/logs"
-	"github.com/beego/beego/server/web"
-	"github.com/beego/beego/server/web/context"
+	"github.com/beego/beego/v2/core/logs"
+	"github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/context"
 )
 
 func main() {
diff --git a/httpserver/filter/opentracing/main.go b/httpserver/filter/opentracing/main.go
@@ -17,8 +17,8 @@ package main
 import (
 	"time"
 
-	"github.com/beego/beego/server/web"
-	"github.com/beego/beego/server/web/filter/opentracing"
+	"github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/filter/opentracing"
 )
 
 func main() {
diff --git a/httpserver/filter/prometheus/main.go b/httpserver/filter/prometheus/main.go
@@ -17,8 +17,8 @@ package main
 import (
 	"time"
 
-	"github.com/beego/beego/server/web"
-	"github.com/beego/beego/server/web/filter/prometheus"
+	"github.com/beego/beego/v2/server/web"
+	"github.com/beego/beego/v2/server/web/filter/prometheus"
 )
 
 func main() {
diff --git a/httpserver/middleware/custom/main.go b/httpserver/middleware/custom/main.go
@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/beego/beego/core/logs"
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/core/logs"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/middleware/thirdparty/main.go b/httpserver/middleware/thirdparty/main.go
@@ -17,7 +17,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 	apmbeego "github.com/opentracing-contrib/beego"
 )
 
diff --git a/httpserver/route/main.go b/httpserver/route/main.go
@@ -15,7 +15,7 @@
 package main
 
 import (
-	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/v2/server/web"
 )
 
 func main() {
diff --git a/httpserver/session/main.go b/httpserver/session/main.go
diff --git a/httpserver/views/main.go b/httpserver/views/main.go
diff --git a/httpserver/xsrf/main.go b/httpserver/xsrf/main.go
diff --git a/logger/console/main.go b/logger/console/main.go
diff --git a/logger/es/main.go b/logger/es/main.go
diff --git a/logger/file/main.go b/logger/file/main.go
diff --git a/logger/formatter/pattern/main.go b/logger/formatter/pattern/main.go
diff --git a/orm/default_value/main.go b/orm/default_value/main.go
diff --git a/orm/mysql/main.go b/orm/mysql/main.go
diff --git a/orm/postgres/main.go b/orm/postgres/main.go
diff --git a/orm/sqlite3/main.go b/orm/sqlite3/main.go
diff --git a/orm/transaction/closure/main.go b/orm/transaction/closure/main.go
diff --git a/orm/transaction/manual/main.go b/orm/transaction/manual/main.go
diff --git a/task/main.go b/task/main.go

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ import (`
`18`	`18`	`"context"`
`19`	`19`	`"time"`
`20`	`20`
`21`		`- "github.com/beego/beego/client/cache"`
`22`		`- "github.com/beego/beego/core/logs"`
	`21`	`+ "github.com/beego/beego/v2/client/cache"`
	`22`	`+ "github.com/beego/beego/v2/core/logs"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package main`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/beego/beego/core/logs"`
`5`		`- "github.com/beego/beego/server/web"`
	`4`	`+ "github.com/beego/beego/v2/core/logs"`
	`5`	`+ "github.com/beego/beego/v2/server/web"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`var (`
-Original file line number
+Diff line change
 go 1.13
 require (
 -	github.com/beego/beego v1.12.4-0.20201213162117-e2a859d1564a
 +	github.com/beego/beego/v2 v2.0.0
 	github.com/go-sql-driver/mysql v1.5.0
 	github.com/lib/pq v1.0.0
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ package main`
`17`	`17`	`import (`
`18`	`18`	`"crypto/tls"`
`19`	`19`
`20`		`- "github.com/beego/beego/client/httplib"`
`21`		`- "github.com/beego/beego/core/logs"`
	`20`	`+ "github.com/beego/beego/v2/client/httplib"`
	`21`	`+ "github.com/beego/beego/v2/core/logs"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`func main() {`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`package main`
`16`	`16`
`17`	`17`	`import (`
`18`		`- "github.com/beego/beego/client/httplib"`
`19`		`- "github.com/beego/beego/core/logs"`
	`18`	`+ "github.com/beego/beego/v2/client/httplib"`
	`19`	`+ "github.com/beego/beego/v2/core/logs"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`func main() {`