From 7550d0838460522a914a55c86a9c054b919a9f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 7 Nov 2022 11:55:33 +0800 Subject: [PATCH 1/7] 1 --- platformapi/jdapi/jdapi.go | 14 ++++++++------ platformapi/jdapi/jdapi_test.go | 31 +++++++++++++++++++++++++++++++ platformapi/jdapi/order_test.go | 16 ++++++++-------- utils/utils_crypt.go | 28 +++++++++++++--------------- 4 files changed, 60 insertions(+), 29 deletions(-) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index da8297d5..d2a6ecbb 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -7,6 +7,7 @@ import ( "encoding/json" "errors" "fmt" + "git.rosy.net.cn/jx-callback/globals" "net/http" "reflect" "sort" @@ -322,7 +323,6 @@ func genNormalHavePageResultParser(dataKey string) (handler PageResultParser) { } result = result0 - if totalCount == 0 { for _, totalCountKey := range havePageTotalCountKeys { if totalCount2, ok := result[totalCountKey]; ok { @@ -398,7 +398,9 @@ func (a *API) AccessAPIHavePage(apiStr string, jdParams map[string]interface{}, var data map[string]interface{} encryptData, err := JDDecodeToData(a.appSecret, jsonResult["encryptData"].(string)) - if err := utils.UnmarshalUseNumber([]byte(encryptData), &data); err != nil { + if err := utils.UnmarshalUseNumber(encryptData, &data); err != nil { + globals.SugarLogger.Errorf("err 1 := %s", err.Error()) + globals.SugarLogger.Errorf("jsonResult=========:= %s", utils.Format4Output(jsonResult, false)) return nil, totalCount, platformapi.ErrResponseDataFormatWrong } innerCode := forceInnerCode2Str(data["code"]) @@ -465,16 +467,16 @@ func JdMap2StructByJson(inObj interface{}, outObjAddr interface{}, weaklyTypedIn return utils.Map2Struct(inObj, outObjAddr, true, "", JavaDateHook) } -func JDDecodeToData(appSecret, data string) (string, error) { +func JDDecodeToData(appSecret, data string) ([]byte, error) { key := appSecret[:16] iv := appSecret[16:32] sDec, err := base64.StdEncoding.DecodeString(data) if err != nil { - return "", err + return nil, err } resp, err := utils.AESCBCDecpryt(sDec, []byte(key), []byte(iv)) if err != nil { - return "", err + return nil, err } - return string(resp), nil + return resp, nil } diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index 316c7c22..ea5191b0 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -3,6 +3,7 @@ package jdapi import ( "encoding/base64" "fmt" + "git.rosy.net.cn/jx-callback/globals" "net/http" "testing" @@ -219,3 +220,33 @@ func TestJdMap2StructByJson(t *testing.T) { t.Log(utils.Format4Output(store, false)) t.Log(store.CreateTime) } + +func TestStringTo(t *testing.T) { + aa := `{"pageNo":1,"totalPage":1,"maxPageSize":100,"pageSize":100,"page":1,"totalCount":3,"resultList":[{"deliveryManPhone":"18822558816","orderType":10000,"srcOrderType":2,"appVersion":"RN","industryTag":3,"orderDynamicFreightMoney":0,"orderTotalMoney":6760,"orderId":2226675449000192,"orderJdSendpay":"{\"orderAddTimeFreightMoney\":200,\"packageFeeCollector\":1}","discount":[{"discountDetailType":2,"orderShareRatioData":"venderShareProportion=100&platShareProportion=0&venderPayMoney=500&platPayMoney=0","discountPrice":500,"discountType":8,"skuIds":"2023435541"},{"discountName":"满19元享特惠","discountDetailType":2201,"discountCode":"879","orderShareRatioData":"venderShareProportion=0&platShareProportion=100&venderPayMoney=0&platPayMoney=200&promotionId=879","discountPrice":200,"discountType":3,"skuIds":"2023435541"},{"discountName":"会员红包月卡6","discountDetailType":1,"discountCode":"1666998435664XC0Ube711800828-1029182512#592637779","orderShareRatioData":"promotionId=1029182512&venderShareProportion=0&platShareProportion=100&venderPayMoney=0&platPayMoney=400&createPin=exc_newviponly@imdada.cn&sortId=1","discountPrice":400,"discountType":3,"skuIds":"2023435541"}],"grabTime":"2022-11-05 20:00:41","tips":0,"deliveryDelayAgreed":0,"buyerCity":"3","yn":false,"orderInvoiceOpenMark":2,"grabMark":4,"adjustCount":0,"buyerCoordType":2,"srcPlatId":4,"deliveryCarrierName":"达达专送","localDeliveryMoney":0,"produceStationName":"京西菜市-中北店","acceptDeadline":"2022-11-05 18:06:08","cartId":"2408:8210:5435:35a0:f951:6182:c95f:2852","srcInnerType":0,"packagingMoney":120,"orderBaseFreightMoney":500,"buyerFullAddress":"订单完结5小时后，隐藏顾客地址。","isJDGetCash":true,"orderDistanceStepFreight":300,"buyerPoi":"云锦世家","pickPin":"jxadmin","middleNumBindingTime":"2022-11-08 19:47:00","buyerTelephone":"17822641285,0126","venderBalanceDeductMoney":0,"buyerLat":39.110653,"buyerPin":"JD_20eb62963769382","orderStatusTime":"2022-11-05 17:51:03","orderAcceptTime":"2022-11-05 18:52:33","srcOrderId":"2226675449000192","isDeleted":false,"cancelOrderIsReadable":true,"deliveryStationNo":"11954632","deliveryPackageWeight":1.5,"orderSkuType":1,"product":[{"skuJdPrice":3380,"promotionType":1,"skuIdIsv":"25011","canteenMoney":0,"skuName":"【新鲜】猪肝（下午易缺货）约750g/份(1斤半)","firstCategoryName":"肉品","skuStorePrice":3380,"skuPurchasePrice":0,"skuSpuId":0,"isGift":false,"adjustMode":0,"skuStockOwner":0,"artificerName":"35247","skuId":2023435541,"categoryId":"20248,20352,20359","skuCount":2,"skuWeight":0.75}],"produceStationNoIsv":"666707","pickTime":"2022-11-05 18:52:49","pickMark":2,"deliveryConfirmTime":"2022-11-05 20:00:41","merchantPaymentDistanceFreightMoney":0,"buyerCityName":"天津市","orderVenderChargeMoney":0,"orderAgingType":9,"orderIsClosed":true,"orderJingdouMoney":0,"orderPreEndDeliveryTime":"2022-11-05 19:47:00","orderAdditionFreightMoney":0,"orderBalanceUsed":0,"ts":"2022-11-05 18:53:29","orderStockOwner":3,"popVenderId":"0","deliveryManNo":"18822558816","equipmentId":"RN_84401c7e00fcdcb2b98e928e5420011999829d63","orderPreDeliveryTime":"2022-11-05 19:47:00","orderFreightMoney":500,"buyerIp":2130706433,"buyerFullName":"天**","deliveryBillNo":"2226675449000192","storeLat":39.127495,"orderPreStartDeliveryTime":"2022-11-05 18:07:00","orderFinanceOrgCode":706,"buyerCountryName":"西青区","adjustIsExists":false,"prescriptionJson":"","prescriptionDTO":{"orderTimeFreightMoney":0,"isRigorous":false,"presaleTotalFrontMoney":0,"orderBizUuid":"0"},"buyerCountry":"51045","orderCloseTime":"2022-11-05 20:00:41","transmissionTime":"2022-11-05 17:51:08","orderBuyerRemark":"\n缺货时电话与我沟通","orderGoodsMoney":6760,"buyerMobile":"17822641285,0126","deliveryStationName":"京西菜市-中北店","orderDiscountMoney":600,"businessTag":"dj_new_promise_v3;dj_new_cashier;dj_aging_immediately;;dj_sx;dj_freight_vender_pay;dj_vender_vip;dj_mobile_safe_order;dj_coupon_logic_80;picking_up;","orderTakeSelfCode":"","adjustId":0,"clientOrderPreStartDeliveryTime":"2022-11-05 18:07:00","produceStationNo":"11954632","orderStatus":90000,"orderPayType":4,"orderNum":3,"deliverInputTime":"2022-11-05 18:52:51","artificerPortraitUrl":"","srcInnerOrderId":0,"deliveryStationNoIsv":"666707","platformPointsDeductionMoney":0,"orderPurchaseTime":"2022-11-05 17:50:57","orgCode":"320406","buyerLng":117.07322,"orderLadderFreightMoney":0,"userAdditionalTips":0,"storeLng":117.087837,"updatePin":"杨向伟","buyerProvince":"0","venderVipCardId":"18622886717","buyerPinType":0,"deliveryType":1,"deliveryPackageVolume":0.0,"userTip":0,"deliveryManName":"杨向伟","orderBuyerPayableMoney":6780,"venderIntegralDeductMoney":0,"lastFourDigitsOfBuyerMobile":"6717","orderBaseReceivableFreight":500,"orderReceivableFreight":1000,"payChannel":8001,"isGroupon":false,"printMark":1,"middleNumBindingId":"2022110517510364682954192880","businessType":1,"grouponId":0,"orderStartTime":"2022-11-05 17:50:48","deliveryCarrierNo":"9966","pickDeadline":"2022-11-05 18:07:00"},{"deliveryManPhone":"17729065398","orderType":10000,"srcOrderType":2,"appVersion":"RN","industryTag":3,"orderDynamicFreightMoney":0,"orderTotalMoney":6160,"orderId":2226674100000073,"orderJdSendpay":"{\"orderAddTimeFreightMoney\":200,\"packageFeeCollector\":1}","discount":[{"discountDetailType":2,"orderShareRatioData":"venderShareProportion=100&platShareProportion=0&venderPayMoney=500&platPayMoney=0","discountPrice":500,"discountType":8,"skuIds":"2027954813,2027905512,2040077538"},{"discountName":"满19元享特惠","discountDetailType":2201,"discountCode":"879","orderShareRatioData":"venderShareProportion=0&platShareProportion=100&venderPayMoney=0&platPayMoney=200&promotionId=879","discountPrice":200,"discountType":3,"skuIds":"2027954813,2027905512,2040077538"},{"discountName":"老朋友福利满25减6","discountDetailType":1,"discountCode":"1667639710994NsHZmY1922937929-1029437765#1629041029","orderShareRatioData":"promotionId=1029437765&venderShareProportion=0&platShareProportion=100&venderPayMoney=0&platPayMoney=600&createPin=liushuting@imdada.cn&sortId=1","discountPrice":600,"discountType":3,"skuIds":"2027905512,2040077538,2027954813"},{"discountName":"会员红包月卡1","discountDetailType":1,"discountCode":"1667640420681t6MgXw1494680005-1029179013#1629041029","orderShareRatioData":"promotionId=1029179013&venderShareProportion=0&platShareProportion=100&venderPayMoney=0&platPayMoney=400&createPin=exc_newviponly@imdada.cn&sortId=2","discountPrice":400,"discountType":3,"skuIds":"2027905512,2040077538,2027954813"}],"grabTime":"2022-11-05 18:02:31","tips":0,"deliveryDelayAgreed":0,"buyerCity":"3","yn":false,"orderInvoiceOpenMark":2,"grabMark":4,"adjustCount":0,"buyerCoordType":2,"srcPlatId":4,"deliveryCarrierName":"达达专送","localDeliveryMoney":0,"produceStationName":"京西菜市-中北店","acceptDeadline":"2022-11-05 17:43:42","cartId":"39.144.82.150","srcInnerType":0,"packagingMoney":120,"orderBaseFreightMoney":500,"buyerFullAddress":"订单完结5小时后，隐藏顾客地址。","isJDGetCash":true,"orderDistanceStepFreight":0,"buyerPoi":"曹庄欣苑7号楼","pickPin":"jxadmin","middleNumBindingTime":"2022-11-08 19:19:00","buyerTelephone":"17695443984,2580","venderBalanceDeductMoney":0,"buyerLat":39.13958,"buyerPin":"JD_21bd8cc7b826acf","orderStatusTime":"2022-11-05 17:28:37","orderAcceptTime":"2022-11-05 17:28:45","srcOrderId":"2226674100000073","isDeleted":false,"cancelOrderIsReadable":true,"deliveryStationNo":"11954632","deliveryPackageWeight":1.3,"orderSkuType":1,"product":[{"skuJdPrice":2310,"promotionType":1,"skuIdIsv":"34431","canteenMoney":0,"skuName":"【火锅食材】脆爽黄喉约150g/份","firstCategoryName":"肉品","skuStorePrice":2310,"skuPurchasePrice":0,"skuSpuId":0,"isGift":false,"adjustMode":0,"skuStockOwner":0,"artificerName":"35247","skuId":2027905512,"categoryId":"20248,20260,20264","skuCount":1,"skuWeight":0.15},{"skuJdPrice":2310,"promotionType":1,"skuIdIsv":"6046768","canteenMoney":0,"skuName":"[火锅伴侣]牛毛肚约150g/份","firstCategoryName":"肉品","skuStorePrice":2310,"skuPurchasePrice":0,"skuSpuId":0,"isGift":false,"adjustMode":0,"skuStockOwner":0,"artificerName":"35247","skuId":2040077538,"categoryId":"20248,20260,20264","skuCount":1,"skuWeight":0.15},{"skuJdPrice":1540,"promotionType":1,"skuIdIsv":"34441","canteenMoney":0,"skuName":"【火锅伴侣】火锅套餐1千克约1kg/份","firstCategoryName":"水果/蔬菜","skuStorePrice":1540,"skuPurchasePrice":0,"skuSpuId":0,"isGift":false,"adjustMode":0,"skuStockOwner":0,"artificerName":"35247","skuId":2027954813,"categoryId":"20307,20363,20364","skuCount":1,"skuWeight":1.0}],"produceStationNoIsv":"666707","pickTime":"2022-11-05 17:41:32","pickMark":2,"deliveryConfirmTime":"2022-11-05 18:02:31","merchantPaymentDistanceFreightMoney":0,"buyerCityName":"天津市","orderVenderChargeMoney":0,"orderAgingType":9,"orderIsClosed":true,"orderJingdouMoney":0,"orderPreEndDeliveryTime":"2022-11-05 19:19:00","orderAdditionFreightMoney":0,"orderBalanceUsed":369,"ts":"2022-11-05 17:41:41","orderStockOwner":3,"popVenderId":"0","deliveryManNo":"17729065398","equipmentId":"RN_234c8e33a69b1660cbfa877d578458681bbea5ad","orderPreDeliveryTime":"2022-11-05 19:19:00","orderFreightMoney":200,"buyerIp":663769750,"buyerFullName":"天**","deliveryBillNo":"2226674100000073","storeLat":39.127495,"orderPreStartDeliveryTime":"2022-11-05 17:44:00","orderFinanceOrgCode":706,"buyerCountryName":"西青区","adjustIsExists":false,"prescriptionJson":"","prescriptionDTO":{"orderTimeFreightMoney":0,"isRigorous":false,"presaleTotalFrontMoney":0,"orderBizUuid":"0"},"buyerCountry":"51045","orderCloseTime":"2022-11-05 18:02:31","transmissionTime":"2022-11-05 17:28:42","orderBuyerRemark":"\n缺货时电话与我沟通","orderGoodsMoney":6160,"buyerMobile":"17695443984,2580","deliveryStationName":"京西菜市-中北店","orderDiscountMoney":1200,"businessTag":"dj_new_promise_v3;dj_new_cashier;dj_aging_immediately;;dj_sx;dj_freight_vender_pay;dj_vender_vip;dj_purchase_vip;vender_first_order;dj_mobile_safe_order;dj_coupon_logic_80;BT00007;picking_up;","orderTakeSelfCode":"","adjustId":0,"clientOrderPreStartDeliveryTime":"2022-11-05 17:44:00","produceStationNo":"11954632","orderStatus":90000,"orderPayType":4,"orderNum":2,"deliverInputTime":"2022-11-05 17:41:34","artificerPortraitUrl":"","srcInnerOrderId":0,"deliveryStationNoIsv":"666707","platformPointsDeductionMoney":0,"orderPurchaseTime":"2022-11-05 17:28:30","orgCode":"320406","buyerLng":117.08362,"orderLadderFreightMoney":0,"userAdditionalTips":0,"storeLng":117.087837,"updatePin":"邵庆文","buyerProvince":"0","buyerPinType":0,"deliveryType":1,"deliveryPackageVolume":0.0,"userTip":0,"deliveryManName":"邵庆文","orderBuyerPayableMoney":5280,"venderIntegralDeductMoney":0,"lastFourDigitsOfBuyerMobile":"3625","orderBaseReceivableFreight":500,"orderReceivableFreight":700,"payChannel":8001,"isGroupon":false,"printMark":1,"middleNumBindingId":"c3ed675857a34ad8880a3a5cc25a756b","businessType":1,"grouponId":0,"orderStartTime":"2022-11-05 17:28:19","deliveryCarrierNo":"9966","pickDeadline":"2022-11-05 17:44:00"},{"deliveryManPhone":"18822558816","orderType":10000,"srcOrderType":2,"appVersion":"RN","industryTag":3,"orderDynamicFreightMoney":0,"orderTotalMoney":4020,"orderId":2226646931001172,"orderJdSendpay":"{\"orderAddTimeFreightMoney\":200,\"packageFeeCollector\":1}","discount":[{"discountDetailType":2,"orderShareRatioData":"venderShareProportion=100&platShareProportion=0&venderPayMoney=500&platPayMoney=0","discountPrice":500,"discountType":8,"skuIds":"2046346925"},{"discountName":"满19元享特惠","discountDetailType":2201,"discountCode":"879","orderShareRatioData":"venderShareProportion=0&platShareProportion=100&venderPayMoney=0&platPayMoney=200&promotionId=879","discountPrice":200,"discountType":3,"skuIds":"2046346925"},{"discountName":"老朋友福利满25减6","discountDetailType":1,"discountCode":"1667613256039jvUzb31581972164-1029437765#454681300","orderShareRatioData":"promotionId=1029437765&venderShareProportion=0&platShareProportion=100&venderPayMoney=0&platPayMoney=600&createPin=liushuting@imdada.cn&sortId=1","discountPrice":600,"discountType":3,"skuIds":"2046346925"}],"grabTime":"2022-11-05 11:20:16","tips":0,"deliveryDelayAgreed":0,"buyerCity":"3","yn":false,"orderInvoiceOpenMark":2,"grabMark":4,"adjustCount":0,"buyerCoordType":2,"srcPlatId":4,"deliveryCarrierName":"达达专送","localDeliveryMoney":0,"produceStationName":"京西菜市-中北店","acceptDeadline":"2022-11-05 10:10:57","cartId":"2408:8210:5448:9930:d087:827b:91b2:708","srcInnerType":0,"packagingMoney":120,"orderBaseFreightMoney":500,"buyerFullAddress":"订单完结5小时后，隐藏顾客地址。","isJDGetCash":true,"orderDistanceStepFreight":0,"buyerPoi":"华侨城万科翡翠嘉和","pickPin":"jxadmin-15022721580","middleNumBindingTime":"2022-11-08 11:21:00","buyerTelephone":"17822641279,3081","venderBalanceDeductMoney":0,"buyerLat":39.132973,"buyerPin":"JD_206acf3dd06bf19","orderStatusTime":"2022-11-05 09:55:52","orderAcceptTime":"2022-11-05 09:55:59","srcOrderId":"2226646931001172","isDeleted":false,"cancelOrderIsReadable":true,"deliveryStationNo":"11954632","deliveryPackageWeight":2.0,"orderSkuType":1,"product":[{"skuJdPrice":2010,"promotionType":1,"skuIdIsv":"6092274","canteenMoney":0,"skuName":"鸡蛋15枚1kg/组","firstCategoryName":"日配/冷藏","skuStorePrice":2010,"skuPurchasePrice":0,"skuSpuId":0,"isGift":false,"adjustMode":0,"skuStockOwner":0,"artificerName":"35247","skuId":2046346925,"upcCode":"6666060922740","categoryId":"20386,22844,23327","skuCount":2,"skuWeight":1.0}],"produceStationNoIsv":"666707","pickTime":"2022-11-05 09:59:23","pickMark":2,"deliveryConfirmTime":"2022-11-05 11:20:16","merchantPaymentDistanceFreightMoney":0,"buyerCityName":"天津市","orderVenderChargeMoney":0,"orderAgingType":9,"orderIsClosed":true,"orderJingdouMoney":0,"orderPreEndDeliveryTime":"2022-11-05 11:21:00","orderAdditionFreightMoney":0,"orderBalanceUsed":0,"ts":"2022-11-05 10:38:48","orderStockOwner":3,"popVenderId":"0","deliveryManNo":"18822558816","equipmentId":"RN_e0729506d407f693c8d3c46c42b7c82749613123","orderPreDeliveryTime":"2022-11-05 11:21:00","orderFreightMoney":200,"buyerIp":2130706433,"buyerFullName":"天**","deliveryBillNo":"2226646931001172","storeLat":39.127495,"orderPreStartDeliveryTime":"2022-11-05 10:11:00","orderFinanceOrgCode":706,"buyerCountryName":"西青区","adjustIsExists":false,"prescriptionJson":"","prescriptionDTO":{"orderTimeFreightMoney":0,"isRigorous":false,"presaleTotalFrontMoney":0,"orderBizUuid":"0"},"buyerCountry":"51045","orderCloseTime":"2022-11-05 11:20:16","transmissionTime":"2022-11-05 09:55:57","orderBuyerRemark":"\n缺货时电话与我沟通","orderGoodsMoney":4020,"buyerMobile":"17822641279,3081","deliveryStationName":"京西菜市-中北店","orderDiscountMoney":800,"businessTag":"dj_new_promise_v3;dj_new_cashier;dj_aging_immediately;;dj_sx;dj_freight_vender_pay;vender_first_order;dj_mobile_safe_order;dj_coupon_logic_80;picking_up;","orderTakeSelfCode":"","adjustId":0,"clientOrderPreStartDeliveryTime":"2022-11-05 10:11:00","produceStationNo":"11954632","orderStatus":90000,"orderPayType":4,"orderNum":1,"deliverInputTime":"2022-11-05 09:59:25","artificerPortraitUrl":"","srcInnerOrderId":0,"deliveryStationNoIsv":"666707","platformPointsDeductionMoney":0,"orderPurchaseTime":"2022-11-05 09:55:46","orgCode":"320406","buyerLng":117.073975,"orderLadderFreightMoney":0,"userAdditionalTips":0,"storeLng":117.087837,"updatePin":"杨向伟","buyerProvince":"0","buyerPinType":0,"deliveryType":1,"deliveryPackageVolume":0.0,"userTip":0,"deliveryManName":"杨向伟","orderBuyerPayableMoney":3540,"venderIntegralDeductMoney":0,"lastFourDigitsOfBuyerMobile":"7906","orderBaseReceivableFreight":500,"orderReceivableFreight":700,"payChannel":8001,"isGroupon":false,"printMark":1,"middleNumBindingId":"2022110509555235502180092799","businessType":1,"grouponId":0,"orderStartTime":"2022-11-05 09:55:30","deliveryCarrierNo":"9966","pickDeadline":"2022-11-05 10:11:00"}]}` + var result0 = make(map[string]interface{}, 0) + if err := utils.UnmarshalUseNumber([]byte(aa), &result0); err != nil { + globals.SugarLogger.Debugf("==============err := %s", err.Error()) + } + + globals.SugarLogger.Debugf("=data :=%s", utils.Format4Output(result0, false)) + +} + +func TestDecode(t *testing.T) { + ccc := `8FvHJcQmVojAIU61SNaS1ermHN2UVWknueRHFSNf2q5EbxNNmznoTYpRu7ySc/8CuU+QGZ9UIBMCyTuFafY3PuszEokEKc8M1Qfv/+o15h5bIU8LXfwRKOCm3JYzZtTOvJVU0hk/USvtDgraToszFl2hQZjZN5gGH1af0X8vopo=` + appSecret := `0bcbe9d6e6124cf2aef2856a540f1326` // 试例token + + //appSecret := `a88d031a1e7b462cb1579f12e97fe7f4` // 320406 + //ccc := `8FvHJcQmVojAIU61SNaS1ermHN2UVWknueRHFSNf2q5EbxNNmznoTYpRu7ySc/8CuU+QGZ9UIBMCyTuFafY3PuszEokEKc8M1Qfv/+o15h5bIU8LXfwRKOCm3JYzZtTOvJVU0hk/USvtDgraToszFl2hQZjZN5gGH1af0X8vopo=` + data, err := JDDecodeToData(appSecret, ccc) + fmt.Println(err) + fmt.Println(string(data)) + fmt.Println(len(data)) + dataMap := make(map[string]interface{}, 0) + + if err := utils.UnmarshalUseNumber(data, &dataMap); err != nil { + fmt.Println("errr2 ==", err) + } + + fmt.Println("data2 :========", utils.Format4Output(dataMap, false)) +} diff --git a/platformapi/jdapi/order_test.go b/platformapi/jdapi/order_test.go index 56c881b1..75cedea9 100644 --- a/platformapi/jdapi/order_test.go +++ b/platformapi/jdapi/order_test.go @@ -2,13 +2,12 @@ package jdapi import ( "fmt" - "testing" - "git.rosy.net.cn/baseapi/utils" + "testing" ) func TestQuerySingleOrder(t *testing.T) { - retVal, err := api.QuerySingleOrder("2113480902000652") + retVal, err := api.QuerySingleOrder("2226810770000091") t.Log(utils.Format4Output(retVal, false)) if err != nil { t.Error(err) @@ -30,14 +29,14 @@ func TestPickUp(t *testing.T) { func TestOrderQuery(t *testing.T) { jdParams := map[string]interface{}{ - "orderId": "2225735125000294", + "deliveryStationNo": "11954632", + "orderPurchaseTime_begin": "2022-11-05 00:00:00", } result, totalCount, err := api.OrderQuery(jdParams) if err != nil { t.Fatalf("OrderQuery return error:%v", err) } t.Log(utils.Format4Output(result, false)) - if len(result) == 0 || totalCount == 0 { t.Fatal("OrderQuery return empty data") } @@ -126,8 +125,9 @@ func TestOrderAddTips(t *testing.T) { func TestOrderQuery2(t *testing.T) { orderList, _, err := api.OrderQuery2(&OrderQueryParam{ - OrderPurchaseTimeBegin: "2021-04-19 00:00:00", - OrderPurchaseTimeEnd: "2021-04-19 23:59:59", + OrderPurchaseTimeBegin: "2022-11-05 00:00:00", + OrderPurchaseTimeEnd: "2022-11-05 23:59:59", + DeliveryStationNo: "11954632", PageNo: 1, PageSize: 99999, }) @@ -138,7 +138,7 @@ func TestOrderQuery2(t *testing.T) { } func TestGetByOrderNoForOaos(t *testing.T) { - orderList, err := api.GetByOrderNoForOaos("2225735125000294") + orderList, err := api.GetByOrderNoForOaos("2226675449000192") t.Log(utils.Format4Output(orderList, false)) if err != nil { t.Fatal(err.Error()) diff --git a/utils/utils_crypt.go b/utils/utils_crypt.go index 3892a67d..e8505a71 100644 --- a/utils/utils_crypt.go +++ b/utils/utils_crypt.go @@ -4,7 +4,6 @@ import ( "bytes" "crypto/aes" "crypto/cipher" - "fmt" ) func AESCBCEncpryt(data, aesKey, iv []byte) (encryptedData []byte, err error) { @@ -24,7 +23,6 @@ func AESCBCDecpryt(encryptedData, aesKey, iv []byte) (decryptedData []byte, err if err != nil { return nil, err } - fmt.Println(c.BlockSize(), len(encryptedData)) cfbdec := cipher.NewCBCDecrypter(c, iv[:c.BlockSize()]) decryptedData = make([]byte, len(encryptedData)) cfbdec.CryptBlocks(decryptedData, encryptedData) @@ -33,19 +31,6 @@ func AESCBCDecpryt(encryptedData, aesKey, iv []byte) (decryptedData []byte, err return decryptedData, nil } -func PKCSUnPadding(originData []byte) []byte { - length := len(originData) - unpadding := int(originData[length-1]) - originData = originData[:(length - unpadding)] - return originData -} - -func PKCSPadding(ciphertext []byte, blockSize int) []byte { - padding := blockSize - len(ciphertext)%blockSize - padtext := bytes.Repeat([]byte{byte(padding)}, padding) - return append(ciphertext, padtext...) -} - // AESCBC16Decrypt 抖音十六位解密 func AESCBC16Decrypt(key, iv, src []byte) ([]byte, error) { decrypted := make([]byte, len(src)) @@ -59,3 +44,16 @@ func AESCBC16Decrypt(key, iv, src []byte) ([]byte, error) { aesDecrypt.CryptBlocks(decrypted, src) return decrypted[:len(decrypted)-int(decrypted[len(decrypted)-1])], err } + +func PKCSUnPadding(originData []byte) []byte { + length := len(originData) + unpadding := int(originData[length-1]) + originData = originData[:(length - unpadding)] + return originData +} + +func PKCSPadding(ciphertext []byte, blockSize int) []byte { + padding := blockSize - len(ciphertext)%blockSize + padtext := bytes.Repeat([]byte{byte(padding)}, padding) + return append(ciphertext, padtext...) +} From 1ba8a9b3551d22815dc43ec131fc5c378fad0d59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 7 Nov 2022 14:48:27 +0800 Subject: [PATCH 2/7] 1 --- platformapi/jdapi/jdapi.go | 2 ++ platformapi/jdapi/jdapi_test.go | 13 ------------- platformapi/jdapi/order_test.go | 2 +- 3 files changed, 3 insertions(+), 14 deletions(-) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index d2a6ecbb..423231f3 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -279,6 +279,8 @@ func (a *API) AccessAPINoPage2(apiStr string, jdParams map[string]interface{}, k if resultParser == nil { resultParser = genNoPageResultParser("code", "msg", "result", "0") } + globals.SugarLogger.Debugf("===========apiStr ,%s,%s,%s", apiStr, utils.Format4Output(jdParams, false) + traceInfo) jsonResult, err := a.AccessAPI2(apiStr, jdParams, traceInfo) if err != nil { return nil, err diff --git a/platformapi/jdapi/jdapi_test.go b/platformapi/jdapi/jdapi_test.go index ea5191b0..bc6013aa 100644 --- a/platformapi/jdapi/jdapi_test.go +++ b/platformapi/jdapi/jdapi_test.go @@ -1,7 +1,6 @@ package jdapi import ( - "encoding/base64" "fmt" "git.rosy.net.cn/jx-callback/globals" "net/http" @@ -60,18 +59,6 @@ func TestAccessAPI(t *testing.T) { } } -func TestGet(t *testing.T) { - key := "0bcbe9d6e6124cf2" - iv := "aef2856a540f1326" - decryDetail := "8FvHJcQmVojAIU61SNaS1ermHN2UVWknueRHFSNf2q5EbxNNmznoTYpRu7ySc/8CuU+QGZ9UIBMCyTuFafY3PuszEokEKc8M1Qfv/+o15h5bIU8LXfwRKOCm3JYzZtTOvJVU0hk/USvtDgraToszFl2hQZjZN5gGH1af0X8vopo=" - sDec, err := base64.StdEncoding.DecodeString(decryDetail) - data, err := utils.AESCBCDecpryt(sDec, []byte(key), []byte(iv)) - localJdParams := make(map[string]interface{}) - ans, err := utils.Unmarshal2Map(data[:len(sDec)], localJdParams) - fmt.Println(ans["billId"]) - fmt.Println(err) -} - func TestAccessAPINoPage(t *testing.T) { result, err := api.AccessAPINoPage("address/allcities", nil, []string{"yn"}, nil, nil) if err != nil { diff --git a/platformapi/jdapi/order_test.go b/platformapi/jdapi/order_test.go index 75cedea9..4d4e3141 100644 --- a/platformapi/jdapi/order_test.go +++ b/platformapi/jdapi/order_test.go @@ -7,7 +7,7 @@ import ( ) func TestQuerySingleOrder(t *testing.T) { - retVal, err := api.QuerySingleOrder("2226810770000091") + retVal, err := api.QuerySingleOrder("2226834717000174") t.Log(utils.Format4Output(retVal, false)) if err != nil { t.Error(err) From 9e86fcc3d4ba2d092b95623bb1f25d497e0e7bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 7 Nov 2022 14:57:54 +0800 Subject: [PATCH 3/7] 1 --- platformapi/jdapi/jdapi.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index 423231f3..211fc619 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -279,8 +279,7 @@ func (a *API) AccessAPINoPage2(apiStr string, jdParams map[string]interface{}, k if resultParser == nil { resultParser = genNoPageResultParser("code", "msg", "result", "0") } - globals.SugarLogger.Debugf("===========apiStr ,%s,%s,%s", apiStr, utils.Format4Output(jdParams, false) - traceInfo) + globals.SugarLogger.Debugf("===========apiStr ,%s,%s,%s", apiStr, utils.Format4Output(jdParams, false), traceInfo) jsonResult, err := a.AccessAPI2(apiStr, jdParams, traceInfo) if err != nil { return nil, err From d444316311c54574e08c5f910b8b31ce7dbc84da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 7 Nov 2022 15:17:26 +0800 Subject: [PATCH 4/7] 1'\ --- platformapi/jdapi/jdapi.go | 1 + platformapi/jdapi/store_test.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index 211fc619..c6759d75 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -295,6 +295,7 @@ func (a *API) AccessAPINoPage2(apiStr string, jdParams map[string]interface{}, k jsonResult["data"] = decodeData } var data map[string]interface{} + globals.SugarLogger.Debugf("==========jsonResult[data]======= %s", jsonResult["data"].(string)) if err := utils.UnmarshalUseNumber([]byte(jsonResult["data"].(string)), &data); err != nil { return nil, platformapi.ErrResponseDataFormatWrong } diff --git a/platformapi/jdapi/store_test.go b/platformapi/jdapi/store_test.go index 171984f1..8fc410d7 100644 --- a/platformapi/jdapi/store_test.go +++ b/platformapi/jdapi/store_test.go @@ -48,7 +48,7 @@ import ( //} // func TestGetStoreInfoByStationNo(t *testing.T) { - result, err := api.GetStoreInfoByStationNo2("12002719") + result, err := api.GetStoreInfoByStationNo2("12028339") if err != nil { t.Fatal(err) } From 92cbc3c89bd20e9f839152968eada170cfda32b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 7 Nov 2022 17:03:07 +0800 Subject: [PATCH 5/7] 1 --- platformapi/jdapi/store_test.go | 35 +++++++++++++++++---------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/platformapi/jdapi/store_test.go b/platformapi/jdapi/store_test.go index 8fc410d7..739e33d1 100644 --- a/platformapi/jdapi/store_test.go +++ b/platformapi/jdapi/store_test.go @@ -1,6 +1,7 @@ package jdapi import ( + "git.rosy.net.cn/baseapi" "git.rosy.net.cn/baseapi/utils" "testing" ) @@ -147,20 +148,20 @@ func TestGetStoreInfoByStationNo(t *testing.T) { // t.Fatal(err) // } //} -// -//func TestGetDeliveryRangeByStationNo(t *testing.T) { -// const testStoreID = "11946249" -// result, err := api.GetDeliveryRangeByStationNo2(testStoreID) -// if err != nil { -// t.Fatal(err) -// } -// baseapi.SugarLogger.Debug(utils.Format4Output(result, false)) -//} -// -//func TestQueryMerchantMemberInfo(t *testing.T) { -// result, err := api.GetCommonMemberRegisteredInfo("562012843072000442") -// if err != nil { -// t.Fatal(err) -// } -// baseapi.SugarLogger.Debug(utils.Format4Output(result, false)) -//} + +func TestGetDeliveryRangeByStationNo(t *testing.T) { + const testStoreID = "12511770" + result, err := api.GetDeliveryRangeByStationNo2(testStoreID) + if err != nil { + t.Fatal(err) + } + baseapi.SugarLogger.Debug(utils.Format4Output(result, false)) +} + +func TestQueryMerchantMemberInfo(t *testing.T) { + result, err := api.GetCommonMemberRegisteredInfo("562012843072000442") + if err != nil { + t.Fatal(err) + } + baseapi.SugarLogger.Debug(utils.Format4Output(result, false)) +} From 53d7a1d3a7ef2efad3e6d75825dad5bc29840747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 7 Nov 2022 18:11:20 +0800 Subject: [PATCH 6/7] 1 --- platformapi/jdapi/jdapi.go | 4 ++-- platformapi/jdapi/order_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index c6759d75..df9607f0 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -292,10 +292,10 @@ func (a *API) AccessAPINoPage2(apiStr string, jdParams map[string]interface{}, k if err != nil { return nil, err } - jsonResult["data"] = decodeData + jsonResult["data"] = string(decodeData) } var data map[string]interface{} - globals.SugarLogger.Debugf("==========jsonResult[data]======= %s", jsonResult["data"].(string)) + globals.SugarLogger.Debugf("============= : %s", jsonResult["data"]) if err := utils.UnmarshalUseNumber([]byte(jsonResult["data"].(string)), &data); err != nil { return nil, platformapi.ErrResponseDataFormatWrong } diff --git a/platformapi/jdapi/order_test.go b/platformapi/jdapi/order_test.go index 4d4e3141..2cd24f6a 100644 --- a/platformapi/jdapi/order_test.go +++ b/platformapi/jdapi/order_test.go @@ -109,7 +109,7 @@ func TestGetAfsService2(t *testing.T) { } func TestOrderShoudSettlementService2(t *testing.T) { - result, err := api.OrderShoudSettlementService2("2114464478000161") + result, err := api.OrderShoudSettlementService2("2226231085000191") if err != nil { t.Fatal(err.Error()) } From 664ae93a90f3632c4fa44baa5f84c0fd8c5412fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 7 Nov 2022 18:40:13 +0800 Subject: [PATCH 7/7] 1 --- platformapi/jdapi/jdapi.go | 1 - 1 file changed, 1 deletion(-) diff --git a/platformapi/jdapi/jdapi.go b/platformapi/jdapi/jdapi.go index df9607f0..1df8ae7f 100644 --- a/platformapi/jdapi/jdapi.go +++ b/platformapi/jdapi/jdapi.go @@ -279,7 +279,6 @@ func (a *API) AccessAPINoPage2(apiStr string, jdParams map[string]interface{}, k if resultParser == nil { resultParser = genNoPageResultParser("code", "msg", "result", "0") } - globals.SugarLogger.Debugf("===========apiStr ,%s,%s,%s", apiStr, utils.Format4Output(jdParams, false), traceInfo) jsonResult, err := a.AccessAPI2(apiStr, jdParams, traceInfo) if err != nil { return nil, err