- add test config
- refresh elme and weixin token only in prod env. - change dada callback to dadadelivery/msg
This commit is contained in:
@@ -28,7 +28,7 @@ mtpsAppKey = "25e816550bc9484480642f19a95f13fd"
|
|||||||
mtpsSecret = "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^"
|
mtpsSecret = "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^"
|
||||||
|
|
||||||
dadaIsProd = false
|
dadaIsProd = false
|
||||||
dadaCallbackURL = "http://callback.test.jxc4.com/dada/order"
|
dadaCallbackURL = "http://callback.test.jxc4.com/dadadelivery/msg"
|
||||||
dadaSourceID = "73753"
|
dadaSourceID = "73753"
|
||||||
|
|
||||||
weixinAppID = "wxbf235770edaabc5c"
|
weixinAppID = "wxbf235770edaabc5c"
|
||||||
@@ -52,7 +52,7 @@ mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
|
|||||||
mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
|
mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
|
||||||
|
|
||||||
dadaIsProd = true
|
dadaIsProd = true
|
||||||
dadaCallbackURL = "http://callback.jingxicaishi.com/dada/order"
|
dadaCallbackURL = "http://callback.jingxicaishi.com/dadadelivery/msg"
|
||||||
dadaSourceID = "6660"
|
dadaSourceID = "6660"
|
||||||
|
|
||||||
weixinAppID = "wx2bb99eb5d2c9b82c"
|
weixinAppID = "wx2bb99eb5d2c9b82c"
|
||||||
@@ -60,3 +60,27 @@ weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
|
|||||||
|
|
||||||
dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jxd_dev_0?charset=utf8&loc=Local"
|
dbConnectStr = "root:WebServer@1@tcp(db1.int.jxc4.com:3306)/jxd_dev_0?charset=utf8&loc=Local"
|
||||||
|
|
||||||
|
[test]
|
||||||
|
freshFoodServerURL = "http://portal.alpha.int.jxc4.com"
|
||||||
|
|
||||||
|
jdToken = "91633f2a-c5f5-4982-a925-a220d19095c3"
|
||||||
|
jdAppKey = "1dba76d40cac446ca500c0391a0b6c9d"
|
||||||
|
jdSecret = "a88d031a1e7b462cb1579f12e97fe7f4"
|
||||||
|
|
||||||
|
elmIsProd = true
|
||||||
|
elmToken = ""
|
||||||
|
elmAppKey = "KLRDcOZGrk"
|
||||||
|
elmSecret = "1fc221f8265506531da36fb613d5f5ad673f2e9a"
|
||||||
|
|
||||||
|
mtpsAppKey = "3c0a05d464c247c19d7ec13accc78605"
|
||||||
|
mtpsSecret = "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE"
|
||||||
|
|
||||||
|
dadaIsProd = true
|
||||||
|
dadaCallbackURL = "http://callback.test.jxc4.com/dadadelivery/msg"
|
||||||
|
dadaSourceID = "6660"
|
||||||
|
|
||||||
|
weixinAppID = "wx2bb99eb5d2c9b82c"
|
||||||
|
weixinSecret = "6bbbed1443cc062c20a015a64c07a531"
|
||||||
|
|
||||||
|
dbConnectStr = "root:WebServer@1@tcp(127.0.0.1:3306)/jxd_dev_0?charset=utf8&loc=Local"
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ func (c *DadaOrderController) URLMapping() {
|
|||||||
// @Description create object
|
// @Description create object
|
||||||
// @Success 200 {string} models.Object.Id
|
// @Success 200 {string} models.Object.Id
|
||||||
// @Failure 403 body is empty
|
// @Failure 403 body is empty
|
||||||
// @router /order [post]
|
// @router /msg [post]
|
||||||
func (c *DadaOrderController) OrderStatusChanged() {
|
func (c *DadaOrderController) OrderStatusChanged() {
|
||||||
obj, callbackResponse := globals2.DadaAPI.GetOrderCallbackMsg(c.Ctx.Input.RequestBody)
|
obj, callbackResponse := globals2.DadaAPI.GetOrderCallbackMsg(c.Ctx.Input.RequestBody)
|
||||||
if callbackResponse == nil {
|
if callbackResponse == nil {
|
||||||
|
|||||||
6
main.go
6
main.go
@@ -16,8 +16,10 @@ func main() {
|
|||||||
|
|
||||||
baseapi.Init(globals.SugarLogger)
|
baseapi.Init(globals.SugarLogger)
|
||||||
controller.InitOrder()
|
controller.InitOrder()
|
||||||
tasks.RefreshWeixinToken()
|
if beego.BConfig.RunMode == "prod" {
|
||||||
tasks.RefreshElmToken()
|
tasks.RefreshWeixinToken()
|
||||||
|
tasks.RefreshElmToken()
|
||||||
|
}
|
||||||
|
|
||||||
if beego.BConfig.RunMode == "dev" {
|
if beego.BConfig.RunMode == "dev" {
|
||||||
beego.BConfig.WebConfig.DirectoryIndex = true
|
beego.BConfig.WebConfig.DirectoryIndex = true
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ func init() {
|
|||||||
&controllers.MTPSOrderController{},
|
&controllers.MTPSOrderController{},
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
nsDada := beego.NewNamespace("/dada",
|
nsDada := beego.NewNamespace("/dadadelivery",
|
||||||
beego.NSInclude(
|
beego.NSInclude(
|
||||||
&controllers.DadaOrderController{},
|
&controllers.DadaOrderController{},
|
||||||
),
|
),
|
||||||
|
|||||||
Reference in New Issue
Block a user