liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- remove enableStore and orderUseNewTable related stuff

Browse Source
This commit is contained in:
gazebo
2019-02-12 15:11:30 +08:00
parent ced25499c4
commit 65000be3d0
11 changed files with 104 additions and 479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
globals/beegodb/beegodb.go
View File

@@ -3,7 +3,6 @@ package beegodb
import (
"git.rosy.net.cn/jx-callback/business/model"
"git.rosy.net.cn/jx-callback/business/model/legacymodel"
"git.rosy.net.cn/jx-callback/business/model/legacymodel2"
"git.rosy.net.cn/jx-callback/globals"
"github.com/astaxie/beego"
"github.com/astaxie/beego/orm"
@@ -16,9 +15,6 @@ func Init() {
orm.RegisterModel(new(legacymodel.BlackClient))
orm.RegisterModel(new(legacymodel.JxBadComments))
orm.RegisterModel(new(legacymodel.StoreBill))
if !globals.OrderUseNewTable {
orm.RegisterModel(new(legacymodel2.Jxstorefeature))
}
orm.RegisterModel(new(legacymodel.TempLog))
orm.RegisterModel(new(legacymodel.WeiXins), new(legacymodel.JxBackendUser))
@@ -32,15 +28,13 @@ func Init() {
orm.RegisterModel(new(model.Message))
orm.RegisterModel(new(model.MessageStatus))
if globals.EnableStore {
orm.RegisterModel(&model.Place{})
orm.RegisterModel(&model.Store{}, &model.StoreSub{}, &model.StoreMap{}, &model.StoreCourierMap{})
orm.RegisterModel(&model.SkuVendorCategory{}, &model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{})
orm.RegisterModel(&model.SkuCategory{})
// orm.RegisterModel(&model.DurableTask{}, &model.DurableTaskItem{})
orm.RegisterModel(&model.Place{})
orm.RegisterModel(&model.Store{}, &model.StoreSub{}, &model.StoreMap{}, &model.StoreCourierMap{})
orm.RegisterModel(&model.SkuVendorCategory{}, &model.StoreSkuCategoryMap{}, &model.SkuName{}, &model.Sku{}, &model.SkuNamePlaceBind{}, &model.StoreSkuBind{})
orm.RegisterModel(&model.SkuCategory{})
// orm.RegisterModel(&model.DurableTask{}, &model.DurableTaskItem{})
orm.RegisterModel(&model.Promotion{}, &model.PromotionStore{}, &model.PromotionSku{})
}
orm.RegisterModel(&model.Promotion{}, &model.PromotionStore{}, &model.PromotionSku{})
if globals.EnablePendingChange {
orm.RegisterModel(&model.StoreOpRequest{})

7
globals/globals.go
View File

@@ -23,7 +23,6 @@ var (
AliKey string
AliSecret string
EnableStore bool
EnableStoreWrite bool
EnableEbaiStoreWrite bool
EnableElmStoreWrite bool
@@ -31,8 +30,6 @@ var (
EnableWscStoreWrite bool
EnablePendingChange bool
OrderUseNewTable bool
QiniuBucket string
WeimobCallbackURL string
WeimobStateSecret string
@@ -58,7 +55,6 @@ func Init() {
AliKey = beego.AppConfig.DefaultString("aliKey", "")
AliSecret = beego.AppConfig.DefaultString("aliSecret", "")
EnableStore = beego.AppConfig.DefaultBool("enableStore", false)
EnableStoreWrite = beego.AppConfig.DefaultBool("enableStoreWrite", false)
EnableEbaiStoreWrite = beego.AppConfig.DefaultBool("enableEbaiStoreWrite", false)
EnableElmStoreWrite = beego.AppConfig.DefaultBool("enableElmStoreWrite", false)
@@ -66,9 +62,6 @@ func Init() {
EnableWscStoreWrite = beego.AppConfig.DefaultBool("enableWscStoreWrite", false)
EnablePendingChange = beego.AppConfig.DefaultBool("enablePendingChange", false)
if EnableStore {
OrderUseNewTable = beego.AppConfig.DefaultBool("orderUseNewTable", false)
}
QiniuBucket = beego.AppConfig.String("qiniuBucket")
WeimobCallbackURL = beego.AppConfig.DefaultString("weimobCallbackURL", "")