aa

2021-03-30 16:27:27 +08:00
parent 5a7e7a0ab7
commit 6235597ba6
21 changed files with 943 additions and 943 deletions
--- a/business/authz/casbinauth/adapter.go
+++ b/business/authz/casbinauth/adapter.go
@@ -3,7 +3,7 @@ package casbinauth
 import (
 	jxmodel "git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/client/orm"
 	"github.com/casbin/casbin/model"
 	"github.com/casbin/casbin/persist"
 )
--- a/business/jxutils/tasks/configrefresh.go
+++ b/business/jxutils/tasks/configrefresh.go
@@ -19,8 +19,8 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"

-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/orm"
+	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/client/orm"
 )

 const (
--- a/business/model/dao/dao.go
+++ b/business/model/dao/dao.go
@@ -8,7 +8,7 @@ import (

 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 )

 const (
--- a/business/model/dao/dao_err.go
+++ b/business/model/dao/dao_err.go
@@ -1,7 +1,7 @@
 package dao

 import (
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/client/orm"
 	"github.com/go-sql-driver/mysql"
 )

--- a/business/model/dao/place.go
+++ b/business/model/dao/place.go
@@ -2,7 +2,7 @@ package dao

 import (
 	"git.rosy.net.cn/jx-callback/business/model"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/client/orm"
 )

 const (
--- a/controllers/auth2_contoller.go
+++ b/controllers/auth2_contoller.go
@@ -14,7 +14,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )

 func GetComposedCode(c *beego.Controller, code string) (composedCode string) {
--- a/controllers/bill_controller.go
+++ b/controllers/bill_controller.go
@@ -2,7 +2,7 @@ package controllers

 import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/financial"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )

 type BillController struct {
--- a/controllers/cms.go
+++ b/controllers/cms.go
@@ -4,7 +4,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxstore/initdata"
 	"git.rosy.net.cn/jx-callback/business/jxutils/datares"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )

 type CmsController struct {
--- a/controllers/cms_task.go
+++ b/controllers/cms_task.go
@@ -8,7 +8,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"

 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )

 type TaskController struct {
--- a/controllers/event_controller.go
+++ b/controllers/event_controller.go
@@ -23,7 +23,7 @@ import (

 	"git.rosy.net.cn/baseapi/utils"

-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )

 // 操作事件明细相关API
--- a/controllers/job_controller.go
+++ b/controllers/job_controller.go
@@ -11,7 +11,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )

 type JobController struct {
--- a/controllers/order_controller.go
+++ b/controllers/order_controller.go
@@ -3,7 +3,7 @@ package controllers
 import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )

 type OrderController struct {
--- a/controllers/tonglian_callback.go
+++ b/controllers/tonglian_callback.go
@@ -12,8 +12,8 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"

-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/context"
+	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web/context"
 )

 type TongLianController struct {
--- a/controllers/user2_controller.go
+++ b/controllers/user2_controller.go
@@ -11,7 +11,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )

 type User2Controller struct {
--- a/controllers/wxpay_callback.go
+++ b/controllers/wxpay_callback.go
@@ -10,7 +10,7 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )

 type WXPayController struct {
--- a/globals/api/api.go
+++ b/globals/api/api.go
@@ -48,7 +48,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/cache/redis"
 	"git.rosy.net.cn/jx-callback/globals"

-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 	"github.com/qiniu/api.v7/auth/qbox"
 )

--- a/globals/beegodb/beegodb.go
+++ b/globals/beegodb/beegodb.go
@@ -3,8 +3,8 @@ package beegodb
 import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/legacymodel"
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/orm"
+	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/adapter/orm"
 )

 func Init() {
--- a/globals/globals.go
+++ b/globals/globals.go
@@ -2,8 +2,8 @@ package globals

 import (
 	"git.rosy.net.cn/baseapi"
-	"github.com/astaxie/beego"
-	"github.com/astaxie/beego/logs"
+	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/core/logs"
 	_ "github.com/go-sql-driver/mysql" // import your used driver
 	"go.uber.org/zap"
 )
--- a/main.go
+++ b/main.go
@@ -14,7 +14,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/misc"
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasks"

-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"

 	// 导入缺省订单调度器

--- a/routers/commentsRouter_controllers.go
+++ b/routers/commentsRouter_controllers.go
--- a/routers/router.go
+++ b/routers/router.go
@@ -1,8 +1,8 @@
 // @APIVersion 1.0.0
-// @Title beego Test API
-// @Description beego has a very cool tools to autogenerate documents for your API
+// @Title web Test API
+// @Description web has a very cool tools to autogenerate documents for your API
 // @Contact astaxie@gmail.com
-// @TermsOfServiceUrl http://beego.me/
+// @TermsOfServiceUrl http://web.me/
 // @License Apache 2.0
 // @LicenseUrl http://www.apache.org/licenses/LICENSE-2.0.html
 package routers
@@ -10,65 +10,65 @@ package routers
 import (
 	"git.rosy.net.cn/jx-callback/controllers"

-	"github.com/astaxie/beego"
-	beecontext "github.com/astaxie/beego/context"
+	"github.com/astaxie/beego/server/web"
+	beecontext "github.com/astaxie/beego/server/web/context"
 )

 func init() {
-	ns := beego.NewNamespace("/v2",
-		beego.NSNamespace("/task",
-			beego.NSInclude(
+	ns := web.NewNamespace("/v2",
+		web.NSNamespace("/task",
+			web.NSInclude(
 				&controllers.TaskController{},
 			),
 		),
-		beego.NSNamespace("/auth2",
-			beego.NSInclude(
+		web.NSNamespace("/auth2",
+			web.NSInclude(
 				&controllers.Auth2Controller{},
 			),
 		),
-		beego.NSNamespace("/user2",
-			beego.NSInclude(
+		web.NSNamespace("/user2",
+			web.NSInclude(
 				&controllers.User2Controller{},
 			),
 		),
-		beego.NSNamespace("/order",
-			beego.NSInclude(
+		web.NSNamespace("/order",
+			web.NSInclude(
 				&controllers.OrderController{},
 			),
 		),
-		beego.NSNamespace("/job",
-			beego.NSInclude(
+		web.NSNamespace("/job",
+			web.NSInclude(
 				&controllers.JobController{},
 			),
 		),
-		beego.NSNamespace("/event",
-			beego.NSInclude(
+		web.NSNamespace("/event",
+			web.NSInclude(
 				&controllers.EventController{},
 			),
 		),
-		beego.NSNamespace("/bill",
-			beego.NSInclude(
+		web.NSNamespace("/bill",
+			web.NSInclude(
 				&controllers.BillController{},
 			),
 		),
-		beego.NSNamespace("/cms",
-			beego.NSInclude(
+		web.NSNamespace("/cms",
+			web.NSInclude(
 				&controllers.CmsController{},
 			),
 		),
 	)
-	beego.AddNamespace(ns)
-	beego.AutoRouter(&controllers.WXPayController{})
-	beego.AutoRouter(&controllers.TongLianController{})
+	web.AddNamespace(ns)
+	web.AutoRouter(&controllers.WXPayController{})
+	web.AutoRouter(&controllers.TongLianController{})

 	// 如下都是用于检测存活的空接口
-	beego.Any("/", func(ctx *beecontext.Context) {
+	web.Any("/", func(ctx *beecontext.Context) {
 		ctx.WriteString("pong\n")
 	})
-	beego.Any("/res", func(ctx *beecontext.Context) {
+	web.Any("/res", func(ctx *beecontext.Context) {
 		ctx.WriteString("pong\n")
 	})
-	beego.Any("/addstoremsg", func(ctx *beecontext.Context) {
+	web.Any("/addstoremsg", func(ctx *beecontext.Context) {
 		ctx.WriteString("pong\n")
 	})
 }