Skip to content

Commit

Permalink
Merge pull request #28 from flycash/txn
Browse files Browse the repository at this point in the history 
using beego v2
  • Loading branch information
@flycash
flycash authored Dec 14, 2020
2 parents 87f52d2 + d57d1a5 commit 0513eee
Show file tree
Hide file tree
Showing 51 changed files with 86 additions and 86 deletions.
4 changes: 2 additions & 2 deletions cache/file/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions cache/memory/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions cache/memorycache/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions cache/redis/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
8 changes: 4 additions & 4 deletions captcha/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions config/loadConfig/main.go
View file
Original file line number Diff line number Diff line change
@@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions config/webAutoLoadConfig/main.go
View file
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions httplib/basic/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions httplib/debug/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions httplib/file/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions httplib/filter/custom/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions httplib/filter/opentracing/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions httplib/filter/prometheus/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions httplib/header/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions httplib/timeout/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/basic/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/controller/error/abort/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/controller/error/customize/main.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

type ErrorController struct {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/controller/error/errorpage/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/controller/error/redirect/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"net/http"

"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/controller/request/body/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"encoding/json"

"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/controller/request/data-binding/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package main
import (
"fmt"

"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/controller/request/form-data/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/controller/request/query/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/controller/request/router-params/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions httpserver/controller/request/upload/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions httpserver/controller/validation/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/cookie/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

// to test this
Expand Down
2 changes: 1 addition & 1 deletion httpserver/download/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions httpserver/filter/basic/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions httpserver/filter/filter_chain/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions httpserver/filter/opentracing/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions httpserver/filter/prometheus/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
4 changes: 2 additions & 2 deletions httpserver/middleware/custom/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion httpserver/middleware/thirdparty/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion httpserver/route/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package main

import (
"github.com/beego/beego/server/web"
"github.com/beego/beego/v2/server/web"
)

func main() {
Expand Down
Loading

0 comments on commit 0513eee

Please sign in to comment.