diff --git a/business/jxstore/cms/user2.go b/business/jxstore/cms/user2.go index ea5708d91..6ef20c611 100644 --- a/business/jxstore/cms/user2.go +++ b/business/jxstore/cms/user2.go @@ -468,7 +468,7 @@ func OnDingDingMsg(msg map[string]interface{}) (callbackResponse *dingdingapi.Ca } } } - return api.DingDingAPI.PackCallbackResult("success") + return api.DingDingAPI.Err2CallbackResponse(nil) } func GetUsers(ctx *jxcontext.Context, userType int, keyword string, userIDs []string, userID2, mobile string, offset, pageSize int) (pagedInfo *model.PagedInfo, err error) { diff --git a/conf/app.conf b/conf/app.conf index 26198d6a2..a8bf81581 100644 --- a/conf/app.conf +++ b/conf/app.conf @@ -103,8 +103,8 @@ dingdingSecret = "1zooB4bmEXPesdwb1ElWASVQ1vinOSZM-1XCUFrrSjHsNAId1UuVCT5tmHSmg5 dingdingQRCodeAppKey = "dingoashf4onhetkegzh3i" dingdingQRCodeSecret = "qjlermCn7wmWh9Qe-zMEaaIr_oDHD02OyOfj_7TZFEjWS5V5lTwAEfa_E8r8Ul42" -dingdingCallbackAESKey = "XvFl8gsm9wcN64zHNgeBDXtFSpLonv1Gbkn1r2i6qvb" -dingdingCallbackToken = "loYVahBlfKMLkLT" +dingdingCallbackAESKey = "5l6PIGMX9svCupF4AShFfD9R7DNQVwS2VRhXnHb6Ln2" +dingdingCallbackToken = "iQzf3uFxzlK1J60KybNEMUOHbsqnR0ThYks" dingdingCallbackURL = "http://callback.test.jxc4.com/dingding/msg" dingdingCorpID = "ding7ab5687f3784a8db" @@ -284,8 +284,8 @@ dingdingAgentID = 239461075 dingdingAppKey = "ding7iu9cptairtcls0c" dingdingSecret = "LWrZAFeqUfuVv7n_tc8vPpCAx6PT4CwManx2XCVhJOqGsx2L5XCDuX1sAN_JtvsI" -dingdingCallbackAESKey = "XvFl8gsm9wcN64zHNgeBDXtFSpLonv1Gbkn1r2i6qvb" -dingdingCallbackToken = "loYVahBlfKMLkLT" +dingdingCallbackAESKey = "5l6PIGMX9svCupF4AShFfD9R7DNQVwS2VRhXnHb6Ln2" +dingdingCallbackToken = "iQzf3uFxzlK1J60KybNEMUOHbsqnR0ThYks" dingdingCallbackURL = "http://callback.jxc4.com/dingding/msg" pushAppID = "5lyyrvHODG6wC8Sdr3a9h" diff --git a/controllers/dingding_callback.go b/controllers/dingding_callback.go index 518b1ffdc..13d69c584 100644 --- a/controllers/dingding_callback.go +++ b/controllers/dingding_callback.go @@ -24,6 +24,7 @@ func (c *DingDingController) Msg() { if c.Ctx.Input.Method() == http.MethodPost { dataMap := utils.URLValues2Map(c.Ctx.Request.Form) obj, callbackResponse := api.DingDingAPI.GetCallbackMsg(dataMap, c.Ctx.Input.RequestBody) + fmt.Println("callbackResponse", utils.Format4Output(callbackResponse, true)) if callbackResponse == nil { globals.SugarLogger.Debugf("dingding msg, obj:%s", utils.Format4Output(obj, false)) callbackResponse = cms.OnDingDingMsg(dataMap) @@ -31,7 +32,6 @@ func (c *DingDingController) Msg() { callbackResponse = api.DingDingAPI.Err2CallbackResponse(nil) } } - fmt.Println("callbackResponse", utils.Format4Output(callbackResponse, true)) c.Data["json"] = callbackResponse c.ServeJSON() } else {