aa

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/adapter/orm"
 	"github.com/casbin/casbin/model"
 	"github.com/casbin/casbin/persist"
 )

business/jxcallback/orderman/order.go

@@ -27,7 +27,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 )
 
 var (

business/jxcallback/orderman/order_afs.go

@@ -10,7 +10,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 )
 
 func (c *OrderManager) LoadAfsOrder(vendorAfsOrderID string, vendorID int) (afsOrder *model.AfsOrder, err error) {

business/jxcallback/orderman/orderman_ext.go

@@ -10,7 +10,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/jxstore/permission"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 
@@ -24,7 +24,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 )
 
 const (

business/jxcallback/orderman/waybill.go

@@ -15,7 +15,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/orm"
+	"github.com/astaxie/beego/adapter/orm"
 )
 
 var (

business/jxcallback/scheduler/defsch/defsch.go

@@ -10,7 +10,7 @@ import (
 
 	push "git.rosy.net.cn/jx-callback/business/jxutils/unipush"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 
@@ -35,7 +35,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/legacymodel"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 )
 
 const (

business/jxstore/act/act.go

@@ -5,9 +5,11 @@ import (
 	"math"
 	"time"
 
+	"git.rosy.net.cn/jx-callback/business/authz"
+
 	"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
 
-	"github.com/astaxie/beego/plugins/authz"
+	// "github.com/astaxie/beego/adapter/plugins/authz"
 
 	"git.rosy.net.cn/jx-callback/business/authz/autils"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/ebai"
@@ -1790,7 +1792,7 @@ func GetNewVendorPopActs(ctx *jxcontext.Context) (err error) {
 			if time.Now().Sub(t) < 0 {
 				result, _ := api.EbaiAPI.GetSubActivityDetail(int(vv.ID))
 				if result.Status.Value == "NO_SIGN_UP" {
-					send(model.VendorIDEBAI, vv.Name, result.Name)
+					send(model.VendorIDEBAI, vv.Name, result.Activity.Name)
 				}
 			}
 		}

business/jxstore/cms/sku.go

@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/baseapi/platformapi/aliupcapi"
 	"git.rosy.net.cn/baseapi/utils"

business/jxstore/cms/store_sku.go

@@ -17,7 +17,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/auth2"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/baseapi/platformapi/jdshopapi"
 
@@ -50,7 +50,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"git.rosy.net.cn/jx-callback/globals"
 	"github.com/360EntSecGroup-Skylar/excelize"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 )
 
 const (

business/jxstore/cms/store_sku_check.go

@@ -8,7 +8,7 @@ import (
 
 	"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
 	"git.rosy.net.cn/jx-callback/business/jxutils/ddmsg"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 

business/jxstore/misc/misc.go

@@ -32,7 +32,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/netspider"
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 const (

business/jxutils/jxutils_cms.go

@@ -17,7 +17,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/baseapi/platformapi"
 	"git.rosy.net.cn/baseapi/utils"

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"
+	beego "github.com/astaxie/beego/adapter"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 )
 
 const (

business/jxutils/unipush/push.go

@@ -11,7 +11,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model/dao"
 	"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"
 )
 
 func pushToSingle(content, title string, storeID int) {

business/jxutils/weixinmsg/weixinmsg.go

@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/jx-callback/business/auth2/authprovider/weixin"
 	"git.rosy.net.cn/jx-callback/business/authz/autils"

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 (

business/model/dao/dao_err.go

@@ -1,7 +1,7 @@
 package dao
 
 import (
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 	"github.com/go-sql-driver/mysql"
 )
 

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/adapter/orm"
 )
 
 const (

business/partner/delivery/dada/waybill.go

@@ -14,7 +14,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"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"
 )
 
 const (

business/partner/delivery/fn/waybill.go

@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"git.rosy.net.cn/baseapi/utils"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"

business/partner/delivery/mtps/waybill.go

@@ -20,8 +20,8 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 	"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"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 )
 
 const (

business/partner/purchase/ebai/order.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
 

business/partner/purchase/jd/sku2.go

@@ -14,7 +14,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner"
 	"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"
 )
 
 const (

business/partner/purchase/jdshop/callback.go

@@ -13,7 +13,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner/delivery/dada"
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/baseapi/platformapi/dadaapi"
 	"git.rosy.net.cn/baseapi/platformapi/dingdingapi"

controllers/act.go

@@ -7,7 +7,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type ActController struct {

controllers/auth2.go

@@ -16,7 +16,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"
 )
 
 func GetComposedCode(c *beego.Controller, code string) (composedCode string) {

controllers/cms.go

@@ -10,7 +10,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/msghub"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"git.rosy.net.cn/jx-callback/globals/api/apimanager"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type CmsController struct {

controllers/cms_food_recipe.go

@@ -4,7 +4,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/userstore"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type FoodRecipeController struct {

controllers/cms_msg.go

@@ -8,7 +8,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/jxutils/weixinmsg"
 	"git.rosy.net.cn/jx-callback/business/model"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type MsgController struct {

controllers/cms_sku.go

@@ -8,7 +8,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 SkuController struct {

controllers/cms_store.go

@@ -9,7 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type StoreController struct {

controllers/cms_store_sku.go

@@ -11,7 +11,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type StoreSkuController struct {

controllers/cms_sync.go

@@ -9,7 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type SyncController struct {

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 {

controllers/cms_user2.go

@@ -13,7 +13,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/business/partner/purchase/jx/localjx"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type User2Controller struct {

controllers/dada_order.go

@@ -8,7 +8,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner/delivery/dada"
 	"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"
 )
 
 // Operations about ELMOrder

controllers/dingding_api.go

@@ -8,7 +8,7 @@ import (
 	"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 DDAPIController struct {

controllers/dingding_callback.go

@@ -7,7 +7,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"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 DingDingController struct {

controllers/ebai_callback.go

@@ -6,7 +6,7 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/ebaiapi"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/ebai"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type EbaiController struct {

controllers/eclp_callback.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type EclpController struct {

controllers/elm_order.go

@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"git.rosy.net.cn/baseapi/platformapi/elmapi"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 // Operations about ELMOrder

controllers/event.go

@@ -20,7 +20,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/event"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 // 操作事件明细相关API

controllers/financial.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
 	"git.rosy.net.cn/jx-callback/business/jxstore/financial"

controllers/fn_callback.go

@@ -11,7 +11,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/globals/api"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type FnController struct {

controllers/init_data.go

@@ -2,7 +2,7 @@ package controllers
 
 import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/initdata"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type InitDataController struct {

controllers/jd2_callback.go

@@ -9,7 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
 	"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"
 )
 
 // Operations about JDOrder

controllers/jd_callback.go

@@ -6,12 +6,13 @@ import (
 	"io/ioutil"
 	"net/http"
 
+	"github.com/astaxie/beego/server/web/context"
+
 	"git.rosy.net.cn/baseapi/platformapi/jdapi"
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
-	"github.com/astaxie/beego/context"
 )
 
 // Operations about JDOrder

controllers/jds_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 JdsController struct {

controllers/jx_order.go

@@ -16,7 +16,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"
 )
 
 // 订单相关API

controllers/jx_order2.go

@@ -5,7 +5,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jx/localjx"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type JxOrderController struct {

controllers/jx_report.go

@@ -4,7 +4,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/cms"
 	"git.rosy.net.cn/jx-callback/business/jxstore/report"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 // 统计相关API

controllers/jxshop_callback.go

@@ -2,7 +2,7 @@ package controllers
 
 import (
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jx/phpjx"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type JxShopController struct {

controllers/mtps_order.go

@@ -5,7 +5,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/partner/delivery/mtps"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 // Operations about ELMOrder

controllers/mtwm_callback.go

@@ -4,7 +4,7 @@ import (
 	"git.rosy.net.cn/baseapi/platformapi/mtwmapi"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/mtwm"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type MtwmController struct {

controllers/net_spider.go

@@ -9,7 +9,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/business/netspider"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type NetSpiderController struct {

controllers/permission.go

@@ -5,7 +5,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/permission"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 	"git.rosy.net.cn/jx-callback/business/model"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type PowerController struct {

controllers/sys.go

@@ -16,7 +16,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/eventhub/syseventhub"
 	"git.rosy.net.cn/jx-callback/business/model"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type SysController struct {

controllers/temp_op.go

@@ -5,7 +5,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/misc"
 	"git.rosy.net.cn/jx-callback/business/jxstore/tempop"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 type TempOpController struct {

controllers/tonglian_callback.go

@@ -11,8 +11,8 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jx/localjx"
 	"git.rosy.net.cn/jx-callback/globals"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
-	"github.com/astaxie/beego/context"
+	"github.com/astaxie/beego/server/web/context"
 )
 
 type TongLianController struct {

controllers/weimob_callback.go

@@ -6,7 +6,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasks"
 	"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 WeimobController struct {

controllers/weixin_callback.go

@@ -5,7 +5,7 @@ import (
 
 	"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 WeixinController struct {

controllers/wxpay_callback.go

@@ -9,7 +9,7 @@ import (
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jx/localjx"
 	"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 {

controllers/yonghui.go

@@ -5,7 +5,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/jxstore/yonghui"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 //读取永辉excelAPI

globals/api/api.go

@@ -41,7 +41,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"
 )
 

globals/beegodb/beegodb.go

@@ -4,8 +4,8 @@ import (
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/legacymodel"
 	"git.rosy.net.cn/jx-callback/globals"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
-	"github.com/astaxie/beego/orm"
+	"github.com/astaxie/beego/adapter/orm"
 )
 
 func Init() {

globals/globals.go

@@ -2,8 +2,8 @@ package globals
 
 import (
 	"git.rosy.net.cn/baseapi"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
-	"github.com/astaxie/beego/logs"
+	"github.com/astaxie/beego/adapter/logs"
 	_ "github.com/go-sql-driver/mysql" // import your used driver
 	"go.uber.org/zap"
 )

globals/testinit1/testinit1.go

@@ -6,7 +6,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/beegodb"
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 )
 
 func Init() {

main.go

@@ -12,7 +12,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/yb"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 
 	"git.rosy.net.cn/baseapi/platformapi/dingdingapi"
 	"git.rosy.net.cn/baseapi/utils"

routers/router.go

@@ -10,8 +10,8 @@ package routers
 import (
 	"git.rosy.net.cn/jx-callback/controllers"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
-	beecontext "github.com/astaxie/beego/context"
+	beecontext "github.com/astaxie/beego/adapter/context"
 )
 
 func init() {

tests/default_test.go

@@ -9,7 +9,7 @@ import (
 
 	_ "git.rosy.net.cn/jx-callback/routers"
 
-	"github.com/astaxie/beego"
+	beego "github.com/astaxie/beego/adapter"
 	. "github.com/smartystreets/goconvey/convey"
 )