diff --git a/platformapi/dadaapi/dadaapi.go b/platformapi/dadaapi/dadaapi.go index a9d2554b..a1b61e56 100644 --- a/platformapi/dadaapi/dadaapi.go +++ b/platformapi/dadaapi/dadaapi.go @@ -135,7 +135,6 @@ func (a *API) AccessAPI(action string, params map[string]interface{}) (retVal *R } return platformapi.ErrLevelCodeIsNotOK, newErr }) - return retVal, err } diff --git a/platformapi/elmapi/elmapi.go b/platformapi/elmapi/elmapi.go index daeca884..6ed6686d 100644 --- a/platformapi/elmapi/elmapi.go +++ b/platformapi/elmapi/elmapi.go @@ -178,7 +178,6 @@ func (a *API) AccessAPI(action string, params map[string]interface{}) (retVal *R return platformapi.ErrLevelCodeIsNotOK, newErr } }) - return retVal, err } diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index 9ff87b3b..f20052df 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -60,8 +60,6 @@ type API struct { } var ( - InnerCodeIsNotOk = "JD result inner code is not ok" - exceedLimitCodes = map[string]int{ ResponseCodeExceedLimit: 1, } @@ -167,7 +165,6 @@ func (a *API) AccessAPI(apiStr string, jdParams map[string]interface{}) (retVal return platformapi.ErrLevelCodeIsNotOK, newErr } }) - return retVal, err } @@ -199,8 +196,7 @@ func (a *API) AccessAPINoPage(apiStr string, jdParams map[string]interface{}, ke baseapi.SugarLogger.Errorf("can not find inner data, data:%v", jsonResult) return nil, platformapi.ErrResponseDataFormatWrong } else { - // todo 可以把具体错误消息放进来 - return nil, utils.NewErrorCode(InnerCodeIsNotOk, innerCode, 1) + return nil, utils.NewErrorCode(string(utils.MustMarshal(data)), innerCode, 1) } } @@ -295,8 +291,7 @@ func (a *API) AccessAPIHavePage(apiStr string, jdParams map[string]interface{}, innerCode := forceInnerCode2Str(data["code"]) if innerCode != "0" && innerCode != "200" { - // todo 可以把具体错误消息放进来 - return nil, utils.NewErrorCode(InnerCodeIsNotOk, innerCode, 1) + return nil, utils.NewErrorCode(string(utils.MustMarshal(data)), innerCode, 1) } inResult, totalCount2, err := pageResultParser(data, totalCount) diff --git a/platformapi/mtpsapi/mtpsapi.go b/platformapi/mtpsapi/mtpsapi.go index 196ade0f..7d3184b3 100644 --- a/platformapi/mtpsapi/mtpsapi.go +++ b/platformapi/mtpsapi/mtpsapi.go @@ -217,7 +217,6 @@ func (a *API) AccessAPI(action string, params map[string]interface{}) (retVal *R newErr := utils.NewErrorIntCode(retVal.Message, code) return platformapi.ErrLevelCodeIsNotOK, newErr }) - return retVal, err } diff --git a/utils/utils.go b/utils/utils.go index b79019ad..de0730cc 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -105,10 +105,10 @@ func MergeMaps(firstMap map[string]interface{}, otherMaps ...map[string]interfac return retVal } -func CallFuncLogError(funcToCall func() error, msg string) error { +func CallFuncLogError(funcToCall func() error, msg string, params ...interface{}) error { err := funcToCall() if err != nil { - baseapi.SugarLogger.Warnf("%s, error:%v", msg, err.Error()) + baseapi.SugarLogger.Warnf("Failed "+msg+" error:%v", append(params, err.Error())...) } return err }