From 0db0dd4ca17722c063f6a722bab123f689bd8a33 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 18 Oct 2018 12:07:21 +0800 Subject: [PATCH] - config prod2 added for another jd account. - can disable some platform. --- business/partner/delivery/dada/waybill.go | 6 ++++-- business/partner/delivery/mtps/waybill.go | 6 ++++-- business/partner/purchase/ebai/ebai.go | 7 +++++-- business/partner/purchase/elm/elm.go | 7 +++++-- business/partner/purchase/jd/jd.go | 7 +++++-- conf/app.conf | 20 +++++++++++++++++++ globals/api/api.go | 24 +++++++++++++++++------ 7 files changed, 61 insertions(+), 16 deletions(-) diff --git a/business/partner/delivery/dada/waybill.go b/business/partner/delivery/dada/waybill.go index 145435f02..abae888d3 100644 --- a/business/partner/delivery/dada/waybill.go +++ b/business/partner/delivery/dada/waybill.go @@ -32,8 +32,10 @@ type DeliveryHandler struct { } func init() { - curDeliveryHandler = new(DeliveryHandler) - scheduler.CurrentScheduler.RegisterDeliveryPlatform(curDeliveryHandler, true) + if api.DadaAPI != nil { + curDeliveryHandler = new(DeliveryHandler) + scheduler.CurrentScheduler.RegisterDeliveryPlatform(curDeliveryHandler, true) + } } func OnWaybillMsg(msg *dadaapi.CallbackMsg) (retVal *dadaapi.CallbackResponse) { diff --git a/business/partner/delivery/mtps/waybill.go b/business/partner/delivery/mtps/waybill.go index 298256e76..ad418fa5a 100644 --- a/business/partner/delivery/mtps/waybill.go +++ b/business/partner/delivery/mtps/waybill.go @@ -34,8 +34,10 @@ type DeliveryHandler struct { } func init() { - curDeliveryHandler = new(DeliveryHandler) - scheduler.CurrentScheduler.RegisterDeliveryPlatform(curDeliveryHandler, true) + if api.MtpsAPI != nil { + curDeliveryHandler = new(DeliveryHandler) + scheduler.CurrentScheduler.RegisterDeliveryPlatform(curDeliveryHandler, true) + } } func (c *DeliveryHandler) GetVendorID() int { diff --git a/business/partner/purchase/ebai/ebai.go b/business/partner/purchase/ebai/ebai.go index a6a055bf0..8ce8c4211 100644 --- a/business/partner/purchase/ebai/ebai.go +++ b/business/partner/purchase/ebai/ebai.go @@ -4,6 +4,7 @@ import ( "git.rosy.net.cn/baseapi/platformapi/ebaiapi" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals/api" ) var ( @@ -15,8 +16,10 @@ type PurchaseHandler struct { } func init() { - curPurchaseHandler = new(PurchaseHandler) - scheduler.CurrentScheduler.RegisterPurchasePlatform(curPurchaseHandler) + if api.EbaiAPI != nil { + curPurchaseHandler = new(PurchaseHandler) + scheduler.CurrentScheduler.RegisterPurchasePlatform(curPurchaseHandler) + } } func EbaiBusStatus2JxStatus(ebaiStatus int) int { diff --git a/business/partner/purchase/elm/elm.go b/business/partner/purchase/elm/elm.go index 14daa97dc..04725b767 100644 --- a/business/partner/purchase/elm/elm.go +++ b/business/partner/purchase/elm/elm.go @@ -6,6 +6,7 @@ import ( "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/jxutils" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals/api" ) var ( @@ -17,8 +18,10 @@ type PurchaseHandler struct { } func init() { - curPurchaseHandler = new(PurchaseHandler) - scheduler.CurrentScheduler.RegisterPurchasePlatform(curPurchaseHandler) + if api.ElmAPI != nil { + curPurchaseHandler = new(PurchaseHandler) + scheduler.CurrentScheduler.RegisterPurchasePlatform(curPurchaseHandler) + } } func (c *PurchaseHandler) GetVendorID() int { diff --git a/business/partner/purchase/jd/jd.go b/business/partner/purchase/jd/jd.go index 7d1aaeeae..7e56534a5 100644 --- a/business/partner/purchase/jd/jd.go +++ b/business/partner/purchase/jd/jd.go @@ -5,6 +5,7 @@ import ( "git.rosy.net.cn/baseapi/utils" "git.rosy.net.cn/jx-callback/business/jxcallback/scheduler" "git.rosy.net.cn/jx-callback/business/model" + "git.rosy.net.cn/jx-callback/globals/api" ) var ( @@ -16,8 +17,10 @@ type PurchaseHandler struct { } func init() { - curPurchaseHandler = new(PurchaseHandler) - scheduler.CurrentScheduler.RegisterPurchasePlatform(curPurchaseHandler) + if api.JdAPI != nil { + curPurchaseHandler = new(PurchaseHandler) + scheduler.CurrentScheduler.RegisterPurchasePlatform(curPurchaseHandler) + } } func (c *PurchaseHandler) GetVendorID() int { diff --git a/conf/app.conf b/conf/app.conf index 1bf4354a2..00a44ea21 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -78,6 +78,26 @@ dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jxd_dev_0?charset=ut enableStore = false +[prod2] +httpport = 8082 + +freshFoodServerURL = "" + +disableJd = false +jdToken = "46058015-11b1-485d-9622-b7a91e446023" +jdAppKey = "8410aba1b67e4d3199098e944f91cb68" +jdSecret = "14af1be608934b73accab57b9efe8c96" + +disableElm = true +disableMtps = true +disableDada = true +disableWeixin = true +disableEbai = true + +dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jxd_dev_2?charset=utf8mb4&loc=Local&parseTime=true" + +enableStore = true + [test] freshFoodServerURL = "http://portal.alpha.int.jxc4.com" diff --git a/globals/api/api.go b/globals/api/api.go index 620582f2c..a0d297570 100644 --- a/globals/api/api.go +++ b/globals/api/api.go @@ -27,14 +27,26 @@ var ( ) func Init() { - JdAPI = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret")) - initElm() - MtpsAPI = mtpsapi.New(beego.AppConfig.String("mtpsAppKey"), beego.AppConfig.String("mtpsSecret")) - DadaAPI = dadaapi.New(beego.AppConfig.String("dadaAppKey"), beego.AppConfig.String("dadaAppSecret"), beego.AppConfig.String("dadaSourceID"), beego.AppConfig.String("dadaCallbackURL"), beego.AppConfig.DefaultBool("dadaIsProd", false)) - WeixinAPI = weixinapi.New(beego.AppConfig.String("weixinAppID"), beego.AppConfig.String("weixinSecret")) + if !beego.AppConfig.DefaultBool("disableJd", false) { + JdAPI = jdapi.New(beego.AppConfig.String("jdToken"), beego.AppConfig.String("jdAppKey"), beego.AppConfig.String("jdSecret")) + } + if !beego.AppConfig.DefaultBool("disableElm", false) { + initElm() + } + if !beego.AppConfig.DefaultBool("disableMtps", false) { + MtpsAPI = mtpsapi.New(beego.AppConfig.String("mtpsAppKey"), beego.AppConfig.String("mtpsSecret")) + } + if !beego.AppConfig.DefaultBool("disableDada", false) { + DadaAPI = dadaapi.New(beego.AppConfig.String("dadaAppKey"), beego.AppConfig.String("dadaAppSecret"), beego.AppConfig.String("dadaSourceID"), beego.AppConfig.String("dadaCallbackURL"), beego.AppConfig.DefaultBool("dadaIsProd", false)) + } + if !beego.AppConfig.DefaultBool("disableWeixin", false) { + WeixinAPI = weixinapi.New(beego.AppConfig.String("weixinAppID"), beego.AppConfig.String("weixinSecret")) + } AutonaviAPI = autonavi.New(beego.AppConfig.String("autonaviKey")) QiniuAPI = qbox.NewMac(beego.AppConfig.String("qiniuAK"), beego.AppConfig.String("qiniuSK")) - EbaiAPI = ebaiapi.New(beego.AppConfig.String("ebaiSource"), beego.AppConfig.String("ebaiSecret")) + if !beego.AppConfig.DefaultBool("disableEbai", false) { + EbaiAPI = ebaiapi.New(beego.AppConfig.String("ebaiSource"), beego.AppConfig.String("ebaiSecret")) + } } func initElm() {