Skip to content

Commit 87f52d2

Browse files
flycashflycash
authored
Merge pull request #27 from flycash/txn
Using beego/beego
2 parents 5f55264 + fe365b0 commit 87f52d2

File tree

60 files changed

+96
-383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+96
-383
lines changed

Diff for: ‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Created by .ignore support plugin (hsz.mobi)
22
.idea
33

4-
.DS_Store
4+
.DS_Store

Diff for: ‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Unless required by applicable law or agreed to in writing, software
1010
distributed under the License is distributed on an "AS IS" BASIS,
1111
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1212
See the License for the specific language governing permissions and
13-
limitations under the License.
13+
limitations under the License.

Diff for: ‎cache/file/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"context"
1919
"time"
2020

21-
"github.com/astaxie/beego/client/cache"
22-
"github.com/astaxie/beego/core/logs"
21+
"github.com/beego/beego/client/cache"
22+
"github.com/beego/beego/core/logs"
2323
)
2424

2525
func main() {

Diff for: ‎cache/memory/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"context"
1919
"time"
2020

21-
"github.com/astaxie/beego/client/cache"
22-
"github.com/astaxie/beego/core/logs"
21+
"github.com/beego/beego/client/cache"
22+
"github.com/beego/beego/core/logs"
2323
)
2424

2525
func main() {

Diff for: ‎cache/memorycache/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ import (
1818
"context"
1919
"time"
2020

21-
"github.com/astaxie/beego/client/cache"
22-
"github.com/astaxie/beego/core/logs"
21+
"github.com/beego/beego/client/cache"
22+
"github.com/beego/beego/core/logs"
2323

2424
// don't forget this
25-
_ "github.com/astaxie/beego/client/cache/memcache"
25+
_ "github.com/beego/beego/client/cache/memcache"
2626
)
2727

2828
func main() {

Diff for: ‎cache/redis/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ import (
1818
"context"
1919
"time"
2020

21-
"github.com/astaxie/beego/client/cache"
21+
"github.com/beego/beego/client/cache"
2222
// don't forget this
23-
_ "github.com/astaxie/beego/client/cache/redis"
24-
"github.com/astaxie/beego/core/logs"
23+
_ "github.com/beego/beego/client/cache/redis"
24+
"github.com/beego/beego/core/logs"
2525
)
2626

2727
func main() {

Diff for: ‎captcha/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
package main
1616

1717
import (
18-
beego "github.com/astaxie/beego/adapter"
19-
"github.com/astaxie/beego/client/cache"
20-
"github.com/astaxie/beego/core/logs"
21-
"github.com/astaxie/beego/server/web/captcha"
18+
beego "github.com/beego/beego/adapter"
19+
"github.com/beego/beego/client/cache"
20+
"github.com/beego/beego/core/logs"
21+
"github.com/beego/beego/server/web/captcha"
2222
)
2323

2424
// init captcha

Diff for: ‎config/loadConfig/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package main
22

33
import (
4-
"github.com/astaxie/beego/core/logs"
5-
"github.com/astaxie/beego/server/web"
4+
"github.com/beego/beego/core/logs"
5+
"github.com/beego/beego/server/web"
66
)
77

88
var (

Diff for: ‎config/webAutoLoadConfig/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package main
22

33
import (
4-
"github.com/astaxie/beego/core/logs"
5-
"github.com/astaxie/beego/server/web"
4+
"github.com/beego/beego/core/logs"
5+
"github.com/beego/beego/server/web"
66
)
77

88
func main() {

Diff for: ‎go.mod

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,9 @@ module github.com/beego-dev/beego-example
33
go 1.13
44

55
require (
6-
github.com/astaxie/beego v1.12.4-0.20201212140031-b92edb6587e9
6+
github.com/beego/beego v1.12.4-0.20201213162117-e2a859d1564a
77
github.com/go-sql-driver/mysql v1.5.0
88
github.com/lib/pq v1.0.0
99
github.com/mattn/go-sqlite3 v2.0.3+incompatible
1010
github.com/opentracing-contrib/beego v0.0.0-20190807091843-a0eec2f7e67c
1111
)
12-
13-
replace (
14-
github.com/astaxie/beego => /Users/mindeng/go-workspace/src/beego
15-
)

Diff for: ‎go.sum

-283
This file was deleted.

Diff for: ‎httplib/basic/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package main
1717
import (
1818
"crypto/tls"
1919

20-
"github.com/astaxie/beego/client/httplib"
21-
"github.com/astaxie/beego/core/logs"
20+
"github.com/beego/beego/client/httplib"
21+
"github.com/beego/beego/core/logs"
2222
)
2323

2424
func main() {

Diff for: ‎httplib/debug/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/client/httplib"
19-
"github.com/astaxie/beego/core/logs"
18+
"github.com/beego/beego/client/httplib"
19+
"github.com/beego/beego/core/logs"
2020
)
2121

2222
func main() {

Diff for: ‎httplib/file/hello.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
hello world
1+
hello world

Diff for: ‎httplib/file/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package main
1717
import (
1818
"io/ioutil"
1919

20-
"github.com/astaxie/beego/client/httplib"
21-
"github.com/astaxie/beego/core/logs"
20+
"github.com/beego/beego/client/httplib"
21+
"github.com/beego/beego/core/logs"
2222
)
2323

2424
func main() {

Diff for: ‎httplib/filter/custom/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"net/http"
2020
"time"
2121

22-
"github.com/astaxie/beego/client/httplib"
23-
"github.com/astaxie/beego/core/logs"
22+
"github.com/beego/beego/client/httplib"
23+
"github.com/beego/beego/core/logs"
2424
)
2525

2626
// implement custom filter
@@ -58,4 +58,4 @@ func myFilter(next httplib.Filter) httplib.Filter {
5858
// Never forget invoke this. Or the request will not be sent
5959
return next(ctx, req)
6060
}
61-
}
61+
}

Diff for: ‎httplib/filter/opentracing/main.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/client/httplib"
19-
"github.com/astaxie/beego/client/httplib/filter/opentracing"
20-
"github.com/astaxie/beego/core/logs"
18+
"github.com/beego/beego/client/httplib"
19+
"github.com/beego/beego/client/httplib/filter/opentracing"
20+
"github.com/beego/beego/core/logs"
2121
)
2222

2323
func main() {
@@ -36,4 +36,4 @@ func main() {
3636
} else {
3737
logs.Info(resp)
3838
}
39-
}
39+
}

Diff for: ‎httplib/filter/prometheus/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/client/httplib"
19-
"github.com/astaxie/beego/client/httplib/filter/prometheus"
20-
"github.com/astaxie/beego/core/logs"
18+
"github.com/beego/beego/client/httplib"
19+
"github.com/beego/beego/client/httplib/filter/prometheus"
20+
"github.com/beego/beego/core/logs"
2121
)
2222

2323
func main() {

Diff for: ‎httplib/header/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/client/httplib"
19-
"github.com/astaxie/beego/core/logs"
18+
"github.com/beego/beego/client/httplib"
19+
"github.com/beego/beego/core/logs"
2020
)
2121

2222
func main() {

Diff for: ‎httplib/timeout/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package main
1717
import (
1818
"time"
1919

20-
"github.com/astaxie/beego/client/httplib"
21-
"github.com/astaxie/beego/core/logs"
20+
"github.com/beego/beego/client/httplib"
21+
"github.com/beego/beego/core/logs"
2222
)
2323

2424
func main() {

Diff for: ‎httpserver/basic/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/server/web"
18+
"github.com/beego/beego/server/web"
1919
)
2020

2121
func main() {

Diff for: ‎httpserver/controller/error/abort/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"github.com/astaxie/beego/server/web"
4+
"github.com/beego/beego/server/web"
55
)
66

77
func main() {

Diff for: ‎httpserver/controller/error/customize/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package main
22

33
import (
4-
"github.com/astaxie/beego/server/web"
4+
"github.com/beego/beego/server/web"
55
)
66

77
type ErrorController struct {

Diff for: ‎httpserver/controller/error/errorpage/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"html/template"
55
"net/http"
66

7-
"github.com/astaxie/beego/server/web"
7+
"github.com/beego/beego/server/web"
88
)
99

1010
func serverError(rw http.ResponseWriter, r *http.Request) {

Diff for: ‎httpserver/controller/error/redirect/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package main
33
import (
44
"net/http"
55

6-
"github.com/astaxie/beego/server/web"
6+
"github.com/beego/beego/server/web"
77
)
88

99
func main() {

Diff for: ‎httpserver/controller/request/body/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package main
1717
import (
1818
"encoding/json"
1919

20-
"github.com/astaxie/beego/server/web"
20+
"github.com/beego/beego/server/web"
2121
)
2222

2323
func main() {

Diff for: ‎httpserver/controller/request/data-binding/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ package main
1717
import (
1818
"fmt"
1919

20-
"github.com/astaxie/beego/server/web"
20+
"github.com/beego/beego/server/web"
2121
)
2222

2323
func main() {

Diff for: ‎httpserver/controller/request/form-data/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/server/web"
18+
"github.com/beego/beego/server/web"
1919
)
2020

2121
func main() {

Diff for: ‎httpserver/controller/request/query/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/server/web"
18+
"github.com/beego/beego/server/web"
1919
)
2020

2121
func main() {

Diff for: ‎httpserver/controller/request/router-params/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/server/web"
18+
"github.com/beego/beego/server/web"
1919
)
2020

2121
func main() {

Diff for: ‎httpserver/controller/request/upload/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/core/logs"
19-
"github.com/astaxie/beego/server/web"
18+
"github.com/beego/beego/core/logs"
19+
"github.com/beego/beego/server/web"
2020
)
2121

2222
func main() {

Diff for: ‎httpserver/controller/validation/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"encoding/json"
1919
"strings"
2020

21-
"github.com/astaxie/beego/core/validation"
22-
"github.com/astaxie/beego/server/web"
21+
"github.com/beego/beego/core/validation"
22+
"github.com/beego/beego/server/web"
2323
)
2424

2525
func main() {

Diff for: ‎httpserver/cookie/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/server/web"
18+
"github.com/beego/beego/server/web"
1919
)
2020

2121
// to test this

Diff for: ‎httpserver/download/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/server/web"
18+
"github.com/beego/beego/server/web"
1919
)
2020

2121
func main() {

Diff for: ‎httpserver/filter/basic/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package main
1717
import (
1818
"fmt"
1919

20-
"github.com/astaxie/beego/server/web"
21-
"github.com/astaxie/beego/server/web/context"
20+
"github.com/beego/beego/server/web"
21+
"github.com/beego/beego/server/web/context"
2222
)
2323

2424
func main() {

Diff for: ‎httpserver/filter/filter_chain/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
package main
1616

1717
import (
18-
"github.com/astaxie/beego/core/logs"
19-
"github.com/astaxie/beego/server/web"
20-
"github.com/astaxie/beego/server/web/context"
18+
"github.com/beego/beego/core/logs"
19+
"github.com/beego/beego/server/web"
20+
"github.com/beego/beego/server/web/context"
2121
)
2222

2323
func main() {

Diff for: ‎httpserver/filter/opentracing/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ package main
1717
import (
1818
"time"
1919

20-
"github.com/astaxie/beego/server/web"
21-
"github.com/astaxie/beego/server/web/filter/opentracing"
20+
"github.com/beego/beego/server/web"
21+
"github.com/beego/beego/server/web/filter/opentracing"
2222
)
2323

2424
func main() {

0 commit comments

Comments
 (0)