groupCallback

pkg/common/http/http_client.go

@@ -7,6 +7,7 @@
 package http
 
 import (
+	cbApi "Open_IM/pkg/call_back_struct"
 	"bytes"
 	"encoding/json"
 	"io/ioutil"
@@ -56,16 +57,22 @@ func Post(url string, data interface{}, timeOutSecond int) (content []byte, err
 	return result, nil
 }
 
-func CallBackPostReturn(url, callbackCommand string, input, output interface{}, timeOut int) error {
+func CallBackPostReturn(url, callbackCommand string, input interface{}, output cbApi.CallbackResp, timeOut int, failedContinue *bool) (bool, error) {
 	v := urlLib.Values{}
 	v.Set("callbackCommand", callbackCommand)
 	url = url + "?" + v.Encode()
 	b, err := Post(url, input, timeOut)
 	if err != nil {
-		return err
+		if failedContinue != nil {
+			return *failedContinue, err
+		}
+		return true, err
 	}
 	if err = json.Unmarshal(b, output); err != nil {
-		return err
+		if failedContinue != nil {
+			return *failedContinue, err
+		}
+		return true, err
 	}
-	return nil
+	return output.Parse()
 }

pkg/common/trace_log/ctx.go

@@ -81,9 +81,9 @@ func SetContextInfo(ctx context.Context, funcName string, err error, args ...int
 	funcInfo.Err = err
 	*t.Funcs = append(*t.Funcs, funcInfo)
 	if err != nil {
-		log.NewError(t.OperationID, funcName, "error: ", err, funcInfo.Args)
+		log.NewError(t.OperationID, funcName, "error", err, "args", funcInfo.Args)
 	} else {
-		log.NewInfo(t.OperationID, funcName, "args: ", funcInfo.Args)
+		log.NewInfo(t.OperationID, funcName, "args", funcInfo.Args)
 	}
 }