Merge branches 'jdshop' and 'jdshop' of https://e.coding.net/rosydev/jx-callback into jdshop

controllers/taobao_vegetable.go

@@ -140,17 +140,17 @@ func (c *TaoBaoVegetableController) ApplyCancelOrder() {
 		return
 	}
 
-	// 验签
+	// 验签 FFF779F16365992BD721C9C1A027F03C
 	sign := Sign(values, utils.Format4Output(afsOrder, false), api.TaoVegetableApi.GetAppSecret())
 	if sign != values.Get("sign") { // 76626F983F0F7E4A159AD64F9B13B332
 		c.Data["json"] = tao_vegetable.CallBackResultSign(fmt.Errorf("非法签名"))
 		c.ServeJSON()
 		return
-	} /*else {
+	} else {
 		c.Data["json"] = tao_vegetable.CallBackResultSign(nil)
 		c.ServeJSON()
 		return
-	}*/
+	}
 
 	callbackResponse := taoVegetable.OnCallbackMsg(tao_vegetable.OrderStatusApplyAfs, afsOrder.OutOrderId, afsOrder)
 	c.Data["json"] = callbackResponse