Merge pull request #27 from flycash/txn

Using beego/beego
beego · Dec 13, 2020 · 87f52d2 · 87f52d2
2 parents 5f55264 + fe365b0
commit 87f52d2
Show file tree

Hide file tree

Showing 60 changed files with 96 additions and 383 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 # Created by .ignore support plugin (hsz.mobi)
 .idea
 
-.DS_Store
+.DS_Store
diff --git 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.
+limitations under the License.
diff --git a/cache/file/main.go b/cache/file/main.go
@@ -18,8 +18,8 @@ import (
 	"context"
 	"time"
 
-	"github.com/astaxie/beego/client/cache"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/cache"
+	"github.com/beego/beego/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/astaxie/beego/client/cache"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/cache"
+	"github.com/beego/beego/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/astaxie/beego/client/cache"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/cache"
+	"github.com/beego/beego/core/logs"
 
 	// don't forget this
-	_ "github.com/astaxie/beego/client/cache/memcache"
+	_ "github.com/beego/beego/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/astaxie/beego/client/cache"
+	"github.com/beego/beego/client/cache"
 	// don't forget this
-	_ "github.com/astaxie/beego/client/cache/redis"
-	"github.com/astaxie/beego/core/logs"
+	_ "github.com/beego/beego/client/cache/redis"
+	"github.com/beego/beego/core/logs"
 )
 
 func main() {

diff --git a/captcha/main.go b/captcha/main.go
@@ -15,10 +15,10 @@
 package main
 
 import (
-	beego "github.com/astaxie/beego/adapter"
-	"github.com/astaxie/beego/client/cache"
-	"github.com/astaxie/beego/core/logs"
-	"github.com/astaxie/beego/server/web/captcha"
+	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"
 )
 
 // init captcha

diff --git a/config/loadConfig/main.go b/config/loadConfig/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/astaxie/beego/core/logs"
-	"github.com/astaxie/beego/server/web"
+	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/server/web"
 )
 
 var (

diff --git a/config/webAutoLoadConfig/main.go b/config/webAutoLoadConfig/main.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/astaxie/beego/core/logs"
-	"github.com/astaxie/beego/server/web"
+	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/server/web"
 )
 
 func main() {

diff --git a/go.mod b/go.mod
@@ -3,13 +3,9 @@ module github.com/beego-dev/beego-example
 go 1.13
 
 require (
-	github.com/astaxie/beego v1.12.4-0.20201212140031-b92edb6587e9
+	github.com/beego/beego v1.12.4-0.20201213162117-e2a859d1564a
 	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
 	github.com/opentracing-contrib/beego v0.0.0-20190807091843-a0eec2f7e67c
 )
-
-replace (
-	github.com/astaxie/beego => /Users/mindeng/go-workspace/src/beego
-)
diff --git a/go.sum b/go.sum
diff --git a/httplib/basic/main.go b/httplib/basic/main.go
@@ -17,8 +17,8 @@ package main
 import (
 	"crypto/tls"
 
-	"github.com/astaxie/beego/client/httplib"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/httplib"
+	"github.com/beego/beego/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/astaxie/beego/client/httplib"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/httplib"
+	"github.com/beego/beego/core/logs"
 )
 
 func main() {

diff --git a/httplib/file/hello.txt b/httplib/file/hello.txt
@@ -1 +1 @@
-hello world
+hello world
diff --git a/httplib/file/main.go b/httplib/file/main.go
@@ -17,8 +17,8 @@ package main
 import (
 	"io/ioutil"
 
-	"github.com/astaxie/beego/client/httplib"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/httplib"
+	"github.com/beego/beego/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/astaxie/beego/client/httplib"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/httplib"
+	"github.com/beego/beego/core/logs"
 )
 
 // implement custom filter
@@ -58,4 +58,4 @@ func myFilter(next httplib.Filter) httplib.Filter {
 		// Never forget invoke this. Or the request will not be sent
 		return next(ctx, req)
 	}
-}
+}
diff --git a/httplib/filter/opentracing/main.go b/httplib/filter/opentracing/main.go
@@ -15,9 +15,9 @@
 package main
 
 import (
-	"github.com/astaxie/beego/client/httplib"
-	"github.com/astaxie/beego/client/httplib/filter/opentracing"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/httplib"
+	"github.com/beego/beego/client/httplib/filter/opentracing"
+	"github.com/beego/beego/core/logs"
 )
 
 func main() {
@@ -36,4 +36,4 @@ func main() {
 	} else {
 		logs.Info(resp)
 	}
-}
+}
diff --git a/httplib/filter/prometheus/main.go b/httplib/filter/prometheus/main.go
@@ -15,9 +15,9 @@
 package main
 
 import (
-	"github.com/astaxie/beego/client/httplib"
-	"github.com/astaxie/beego/client/httplib/filter/prometheus"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/httplib"
+	"github.com/beego/beego/client/httplib/filter/prometheus"
+	"github.com/beego/beego/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/astaxie/beego/client/httplib"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/httplib"
+	"github.com/beego/beego/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/astaxie/beego/client/httplib"
-	"github.com/astaxie/beego/core/logs"
+	"github.com/beego/beego/client/httplib"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/core/logs"
-	"github.com/astaxie/beego/server/web"
+	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/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/astaxie/beego/core/validation"
-	"github.com/astaxie/beego/server/web"
+	"github.com/beego/beego/core/validation"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
-	"github.com/astaxie/beego/server/web/context"
+	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/core/logs"
-	"github.com/astaxie/beego/server/web"
-	"github.com/astaxie/beego/server/web/context"
+	"github.com/beego/beego/core/logs"
+	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/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/astaxie/beego/server/web"
-	"github.com/astaxie/beego/server/web/filter/opentracing"
+	"github.com/beego/beego/server/web"
+	"github.com/beego/beego/server/web/filter/opentracing"
 )
 
 func main() {