Merge remote-tracking branch 'origin/mark' into su

controllers/weimob_callback.go

@@ -2,8 +2,8 @@ package controllers
 
 import (
 	"git.rosy.net.cn/baseapi/platformapi/weimobapi"
-	"git.rosy.net.cn/jx-callback/business/jxutils/tasks"
 	"git.rosy.net.cn/jx-callback/business/cs"
+	"git.rosy.net.cn/jx-callback/business/jxutils/tasks"
 	"git.rosy.net.cn/jx-callback/globals"
 	"git.rosy.net.cn/jx-callback/globals/api"
 	"github.com/astaxie/beego"
@@ -15,12 +15,14 @@ type WeimobController struct {
 
 func (c *WeimobController) onCallbackMsg() {
 	if true { //c.Ctx.Input.Method() == http.MethodPost {
-		callbackResponse := weimobapi.SuccessResponse
 		msg, callbackResponse := api.WeimobAPI.GetCallbackMsg(c.Ctx.Input.RequestBody)
 		if callbackResponse == nil {
 			// callbackResponse = wsc.OnCallbackMsg(msg)
 			callbackResponse = cs.OnCallbackMsg(msg)
 		}
+		if callbackResponse == nil {
+			callbackResponse = weimobapi.SuccessResponse
+		}
 		c.Data["json"] = callbackResponse
 		c.ServeJSON()
 	} else {