liulei/baseapi
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fix unittest bug caused by sugarLogger.

Browse Source
This commit is contained in:
gazebo
2018-06-20 20:55:35 +08:00
parent 21773180a2
commit efbfafb4ab
6 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platform/elmapi/elmapi.go
View File

@@ -149,8 +149,8 @@ func (e *ELMAPI) AccessELM(action string, params map[string]interface{}) (retVal
if errinfoMap == nil {
return common.PAErrorLevelSuccess, nil
}
baseapi.SugarLogger.Debug(jsonResult1)
errCode := errinfoMap["code"].(string)
if errCode == "EXCEED_LIMIT" {
return common.PAErrorLevelExceedLimit, nil
} else if errCode == "SERVER_ERROR" || errCode == "BIZ_SYSTEM_ERROR" || errCode == "BIZ_1006" || errCode == "BUSINESS_ERROR" {

7
platform/elmapi/elmapi_test.go
View File

@@ -3,6 +3,8 @@ package elmapi
import (
"testing"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils"
"go.uber.org/zap"
)
@@ -15,12 +17,13 @@ var (
func init() {
logger, _ := zap.NewDevelopment()
sugarLogger = logger.Sugar()
baseapi.Init(sugarLogger)
// sandbox
elmapi = NewELMAPI("2d2b583447b04b6bba5a6f3faed3559b", "RwT214gAsS", "56afff4b9ebd8a7eb532d18fa33f17be57f9b9db", sugarLogger, false)
elmapi = NewELMAPI("2d2b583447b04b6bba5a6f3faed3559b", "RwT214gAsS", "56afff4b9ebd8a7eb532d18fa33f17be57f9b9db", false)
// prod
// elmapi = NewELMAPI("bab2a27f99562f394b411dbb9a6214da", "KLRDcOZGrk", "1fc221f8265506531da36fb613d5f5ad673f2e9a", sugarLogger, true)
// elmapi = NewELMAPI("bab2a27f99562f394b411dbb9a6214da", "KLRDcOZGrk", "1fc221f8265506531da36fb613d5f5ad673f2e9a", true)
}
func TestTest(t *testing.T) {

2
platform/jdapi/jdapi.go
View File

@@ -182,7 +182,7 @@ func (j *JDAPI) AccessJDQuery(apiStr string, jdParams map[string]string) (retVal
retVal = jsonResult1
return common.PAErrorLevelSuccess, nil
}
baseapi.SugarLogger.Debugf("jd code is:%s", code)
baseapi.SugarLogger.Debug(jsonResult1)
if _, ok := exceedLimitCodes[code]; ok {
return common.PAErrorLevelExceedLimit, nil
} else if _, ok := canRetryCodes[code]; ok {

7
platform/jdapi/jdapi_test.go
View File

@@ -4,6 +4,8 @@ import (
"net/http"
"testing"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils"
"go.uber.org/zap"
)
@@ -16,8 +18,9 @@ var (
func init() {
logger, _ := zap.NewDevelopment()
sugarLogger = logger.Sugar()
jdapi = NewJDAPI("91633f2a-c5f5-4982-a925-a220d19095c3", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4", sugarLogger)
// jdapi = NewJDAPI("c8854ef2-f80a-45ee-aceb-dc8014d646f8", "06692746f7224695ad4788ce340bc854", "d6b42a35a7414a5490d811654d745c84", sugarLogger)
baseapi.Init(sugarLogger)
jdapi = NewJDAPI("91633f2a-c5f5-4982-a925-a220d19095c3", "1dba76d40cac446ca500c0391a0b6c9d", "a88d031a1e7b462cb1579f12e97fe7f4")
// jdapi = NewJDAPI("c8854ef2-f80a-45ee-aceb-dc8014d646f8", "06692746f7224695ad4788ce340bc854", "d6b42a35a7414a5490d811654d745c84")
}
func TestTest(t *testing.T) {

16
platform/mtpsapi/mtpsapi.go
View File

@@ -192,13 +192,13 @@ func (m *MTPSAPI) AccessMTPS(action string, params map[string]interface{}) (retV
retVal = &MTPSResult{
Code: code,
}
baseapi.SugarLogger.Debug(jsonResult1)
if code == ResponseCodeSuccess {
if innerData, ok := jsonResult1["data"]; ok {
retVal.Data, _ = innerData.(map[string]interface{})
}
return common.PAErrorLevelSuccess, nil
}
baseapi.SugarLogger.Debug(jsonResult1)
retVal.Message = jsonResult1["message"].(string)
return common.PAErrorLevelGeneralFail, utils.NewErrorIntCode(retVal.Message, code)
})
@@ -216,20 +216,20 @@ func (m *MTPSAPI) result2OrderResponse(result *MTPSResult) (order *MtpsOrderResp
func (m *MTPSAPI) CreateOrderByShop(basicParams *MtpsCreateOrderByShopInfo, addParams map[string]interface{}) (order *MtpsOrderResponse, err error) {
params := make(map[string]interface{})
params["delivery_id"] = utils.Int64ToStr(basicParams.DeliveryId)
params["delivery_id"] = basicParams.DeliveryId
params["order_id"] = basicParams.OrderId
params["shop_id"] = basicParams.ShopId
params["delivery_service_code"] = utils.Int2Str(basicParams.DeliveryServiceCode)
params["delivery_service_code"] = basicParams.DeliveryServiceCode
params["receiver_name"] = basicParams.ReceiverName
params["receiver_address"] = basicParams.ReceiverAddress
params["receiver_phone"] = basicParams.ReceiverPhone
params["receiver_lng"] = utils.Int2Str(basicParams.ReceiverLng)
params["receiver_lat"] = utils.Int2Str(basicParams.ReceiverLat)
params["coordinate_type"] = utils.Int2Str(basicParams.CoordinateType)
params["receiver_lng"] = basicParams.ReceiverLng
params["receiver_lat"] = basicParams.ReceiverLat
params["coordinate_type"] = basicParams.CoordinateType
params["goods_value"] = strconv.FormatFloat(basicParams.GoodsValue, 'f', 2, 64)
params["goods_weight"] = strconv.FormatFloat(basicParams.GoodsWeight, 'f', 2, 64)
params["expected_delivery_time"] = utils.Int64ToStr(basicParams.ExpectedDeliveryTime)
params["order_type"] = utils.Int2Str(basicParams.OrderType)
params["expected_delivery_time"] = basicParams.ExpectedDeliveryTime
params["order_type"] = basicParams.OrderType
if addParams != nil {
for k, v := range addParams {
params[k] = v

7
platform/mtpsapi/mtpsapi_test.go
View File

@@ -3,6 +3,8 @@ package mtpsapi
import (
"testing"
"git.rosy.net.cn/baseapi"
"git.rosy.net.cn/baseapi/utils"
"go.uber.org/zap"
)
@@ -15,8 +17,9 @@ var (
func init() {
logger, _ := zap.NewDevelopment()
sugarLogger = logger.Sugar()
mtpsapi = NewMTPSAPI("25e816550bc9484480642f19a95f13fd", "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^", sugarLogger)
// mtpsapi = NewMTPSAPI("3c0a05d464c247c19d7ec13accc78605", "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE", sugarLogger)
baseapi.Init(sugarLogger)
mtpsapi = NewMTPSAPI("25e816550bc9484480642f19a95f13fd", "r4$HqrKx9~=7?2Jfo,$Z~a7%~k!Au&pEdI2)oPJvSbH2ao@2N0[8wSIvtuumh_J^")
// mtpsapi = NewMTPSAPI("3c0a05d464c247c19d7ec13accc78605", "b1M}9?:sTbsB[OF2gNORnN(|(iy9rB8(`7]|[wGLnbmt`evfM>E:A90DjHAW:UPE")
}
func handleError(t *testing.T, err error) {