aa

controllers/act.go

@@ -7,11 +7,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type ActController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 预创建活动
@@ -240,7 +240,7 @@ func (c *ActController) UpdateActStoreSkuBind() {
 				err = fmt.Errorf("actStoreSkuAddList与actStoreSkuDeleteList不能都为空")
 			} else {
 				db := dao.GetDB()
-				txDB , _ := dao.Begin(db)
+				txDB, _ := dao.Begin(db)
 				func() {
 					defer func() {
 						if r := recover(); r != nil {

controllers/auth2.go

@@ -16,10 +16,10 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
-func GetComposedCode(c *beego.Controller, code string) (composedCode string) {
+func GetComposedCode(c *web.Controller, code string) (composedCode string) {
 	composedCode = code
 	referer := c.Ctx.Request.Referer()
 	globals.SugarLogger.Debugf("GetComposedCode referer:%s", referer)
@@ -34,7 +34,7 @@ func GetComposedCode(c *beego.Controller, code string) (composedCode string) {
 }
 
 type Auth2Controller struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 生成captcha

controllers/auth_controller.go

@@ -8,7 +8,7 @@ package controllers
 
 // // 认证相关API
 // type AuthController struct {
-// 	beego.Controller
+// 	web.Controller
 // }
 
 // var (

controllers/cms.go

@@ -10,11 +10,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type CmsController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 得到地点（省，城市，区）信息

controllers/cms_food_recipe.go

@@ -4,11 +4,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type FoodRecipeController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 创建菜谱

controllers/cms_msg.go

@@ -8,11 +8,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type MsgController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 发送微信消息

controllers/cms_sku.go

@@ -8,11 +8,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type SkuController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 得到厂商商品类别

controllers/cms_store.go

@@ -9,11 +9,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type StoreController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 得到京西门店信息

controllers/cms_store_sku.go

@@ -11,11 +11,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type StoreSkuController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 得到商家商品信息

controllers/cms_sync.go

@@ -9,11 +9,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type SyncController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 同步商家商品信息

controllers/cms_task.go

@@ -8,11 +8,11 @@ import (
 	"git.rosy.net.cn/jx-callback/business/jxutils"
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/tasksch"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type TaskController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 查询长时间运行任务

controllers/cms_user.go

@@ -1,7 +1,7 @@
 package controllers
 
 // type UserController struct {
-// 	beego.Controller
+// 	web.Controller
 // }
 
 // // @Title 得到门店用户信息

controllers/dada_order.go

@@ -8,12 +8,12 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 // Operations about ELMOrder
 type DadaDeliveryController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *DadaDeliveryController) Msg() {

controllers/dingding_api.go

@@ -8,11 +8,11 @@ import (
 	"git.rosy.net.cn/jx-callback/globals"
 
 	"git.rosy.net.cn/jx-callback/globals/api"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type DDAPIController struct {
-	beego.Controller
+	web.Controller
 }
 
 type DDAPI struct {

controllers/dingding_callback.go

@@ -7,11 +7,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type DingDingController struct {
-	beego.Controller
+	web.Controller
 }
 
 func init() {

controllers/ebai_callback.go

@@ -6,11 +6,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type EbaiController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *EbaiController) Msg() {

controllers/eclp_callback.go

@@ -4,11 +4,11 @@ import (
 	"fmt"
 	"net/http"
 
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type EclpController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *EclpController) Msg() {

controllers/elm_order.go

@@ -4,12 +4,12 @@ import (
 	"net/http"
 
 	"git.rosy.net.cn/baseapi/platformapi/elmapi"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 // Operations about ELMOrder
 type ElemeController struct {
-	beego.Controller
+	web.Controller
 }
 
 // https://open.shop.ele.me/openapi/documents/httppushmethod

controllers/event.go

@@ -20,12 +20,12 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 // 操作事件明细相关API
 type EventController struct {
-	beego.Controller
+	web.Controller
 }
 
 //连接的客户端,吧每个客户端都放进来

controllers/financial.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"io"
 
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 
 	"git.rosy.net.cn/jx-callback/business/jxcallback/orderman"
 	"git.rosy.net.cn/jx-callback/business/jxstore/financial"
@@ -13,7 +13,7 @@ import (
 )
 
 type FinancialController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 发送文件给门店

controllers/fn_callback.go

@@ -11,11 +11,11 @@ import (
 
 	"git.rosy.net.cn/jx-callback/globals/api"
 
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type FnController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *FnController) Msg() {

controllers/init_data.go

@@ -2,11 +2,11 @@ package controllers
 
 import (
 	"git.rosy.net.cn/jx-callback/business/jxstore/initdata"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type InitDataController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 初始化place信息

controllers/jd2_callback.go

@@ -9,12 +9,12 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 // Operations about JDOrder
 type Djsw2Controller struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *Djsw2Controller) handleMsg(handler func(*jdapi.API, interface{}) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) {

controllers/jd_callback.go

@@ -12,12 +12,12 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jd"
 	"git.rosy.net.cn/jx-callback/globals"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 // Operations about JDOrder
 type DjswController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *DjswController) handleMsg(handler func(*jdapi.API, interface{}) *jdapi.CallbackResponse) (callbackResponse *jdapi.CallbackResponse) {

controllers/jds_callback.go

@@ -10,11 +10,11 @@ import (
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type JdsController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *JdsController) Msg() {

controllers/jx_order.go

@@ -16,12 +16,12 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 // 订单相关API
 type OrderController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *OrderController) URLMapping() {

controllers/jx_order2.go

@@ -5,11 +5,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type JxOrderController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 创建京西商城订单

controllers/jx_report.go

@@ -4,12 +4,12 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 // 统计相关API
 type ReportController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 查询订单统计信息

controllers/jxshop_callback.go

@@ -2,11 +2,11 @@ package controllers
 
 import (
 	"git.rosy.net.cn/jx-callback/business/partner/purchase/jx/phpjx"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type JxShopController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 京西自营商城消息回调接口

controllers/mtps_order.go

@@ -5,12 +5,12 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/partner/delivery/mtps"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 // Operations about ELMOrder
 type MtpsController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *MtpsController) Status() {

controllers/mtwm_callback.go

@@ -4,11 +4,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type MtwmController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *MtwmController) onCallbackMsg(msgType string) {

controllers/net_spider.go

@@ -9,11 +9,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type NetSpiderController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 从网页拉取平台门店信息

controllers/permission.go

@@ -5,11 +5,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type PowerController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 添加功能（菜单）

controllers/sys.go

@@ -16,11 +16,11 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/eventhub/syseventhub"
 	"git.rosy.net.cn/jx-callback/business/model"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type SysController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 得到微信token

controllers/temp_op.go

@@ -5,11 +5,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type TempOpController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 将为份的商品在京东转成SPU

controllers/tonglian_callback.go

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

controllers/weimob_callback.go

@@ -6,11 +6,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type WeimobController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *WeimobController) onCallbackMsg() {

controllers/weixin_callback.go

@@ -5,11 +5,11 @@ import (
 
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type WeixinController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *WeixinController) Msg() {

controllers/wxpay_callback.go

@@ -9,11 +9,11 @@ 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"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 type WXPayController struct {
-	beego.Controller
+	web.Controller
 }
 
 func (c *WXPayController) Msg() {

controllers/yonghui.go

@@ -5,12 +5,12 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/jxstore/yonghui"
 	"git.rosy.net.cn/jx-callback/business/jxutils"
-	beego "github.com/astaxie/beego/adapter"
+	"github.com/astaxie/beego/server/web"
 )
 
 //读取永辉excelAPI
 type YongHuiController struct {
-	beego.Controller
+	web.Controller
 }
 
 // @Title 读取永辉excel文件