From f85f429c6a6dcc5bb28e2684855804cb09b33f91 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 6 Jul 2023 15:03:44 +0800 Subject: [PATCH 1/2] 1 --- platformapi/mtwmapi/im_test.go | 16 ++++++++++++++++ platformapi/tao_vegetable/store_skuAct.go | 3 +++ platformapi/uinapp/uin_app_test.go | 21 ++++++++++++++++++++- 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/platformapi/mtwmapi/im_test.go b/platformapi/mtwmapi/im_test.go index fc50bf8a..3352b9c9 100644 --- a/platformapi/mtwmapi/im_test.go +++ b/platformapi/mtwmapi/im_test.go @@ -1,9 +1,12 @@ package mtwmapi import ( + "encoding/base64" "encoding/json" "fmt" + "git.rosy.net.cn/baseapi/utils" "github.com/go-redis/redis" + "reflect" "testing" "time" ) @@ -51,3 +54,16 @@ func TestMashal(t *testing.T) { fmt.Println(pushContent) } } + +func TestImDecpryt(t *testing.T) { + msg := "1YAUiB1SGjIlq9yGnlMidg3bpzod7wD8rRdz0avVyqGLAtoBkpcb9TX4MtStdOPPV8S/IGWpBoebIkcy4TPsTOjod4k3IBjAjjjueiy6so3JN8I/NGmMe0cgMV88HlfXBrv/rn2FSij1zOGIMUcLWeiMh81aLMTMIjf43t1kG4mAor8D4P9v5lPv7Pjqa4MzxGqo0K/pGTE3MrXDRoyAw7JyhdICxDBCZUwNFDrIDnWvdQrYoMjNf8cWZw1MZHdk" + data, _ := base64.StdEncoding.DecodeString(msg) + key1 := utils.LimitUTF8StringLen2("a81eb3df418d83d6a1a4b7c572156d2f", 16) + fmt.Println(key1) + //key, _ := base64.StdEncoding.DecodeString("a81eb3df418d83d6a1a4b7c572156d2f") + //data, err := utils.AESCBC16Decrypt([]byte(msg), []byte("a81eb3df418d83d6"), []byte("a81eb3df418d83d6")) + //data, err := utils.AESCBCDecpryt([]byte(msg), key, key) + res, _ := utils.AESCBCDecpryt(data, []byte(key1), []byte(key1)) + fmt.Println(reflect.TypeOf(res)) + fmt.Println(string(res)) +} diff --git a/platformapi/tao_vegetable/store_skuAct.go b/platformapi/tao_vegetable/store_skuAct.go index 79e89356..2e134a72 100644 --- a/platformapi/tao_vegetable/store_skuAct.go +++ b/platformapi/tao_vegetable/store_skuAct.go @@ -6,6 +6,7 @@ import ( "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability2770/domain" "git.rosy.net.cn/baseapi/platformapi/tao_vegetable/sdk/ability2770/request" "git.rosy.net.cn/baseapi/utils" + "git.rosy.net.cn/jx-callback/globals" ) // ActCreateReq 1 活动详情 @@ -20,6 +21,7 @@ type SkuChannelConfigs = domain.AlibabaRetailMarketingItemdiscountActivitySkuAdd // ActivityCreate 创建单品特价活动【同城零售】 1-1 func (a *API) ActivityCreate(param domain.AlibabaRetailMarketingItemdiscountActivityCreateItemDiscountActivityOperateRequest) (actID int64, err error) { act := ability2770.NewAbility2770(&a.client) + globals.SugarLogger.Debugf("ActivityCreate req=%s", utils.Format4Output(param, false)) resp, err := act.AlibabaRetailMarketingItemdiscountActivityCreate(&request.AlibabaRetailMarketingItemdiscountActivityCreateRequest{ Param: ¶m, }, a.token) @@ -40,6 +42,7 @@ type skuAct struct { // ActivitySkuCreate 特价活动新增商品 1-2 func (a *API) ActivitySkuCreate(param domain.AlibabaRetailMarketingItemdiscountActivitySkuAddItemDiscountActivityElementOperateRequest) (error, *skuAct, []string) { act := ability2770.NewAbility2770(&a.client) + globals.SugarLogger.Debugf("ActivitySkuCreate req=%s", utils.Format4Output(param, false)) resp, err := act.AlibabaRetailMarketingItemdiscountActivitySkuAdd(&request.AlibabaRetailMarketingItemdiscountActivitySkuAddRequest{ Param: ¶m, }, a.token) diff --git a/platformapi/uinapp/uin_app_test.go b/platformapi/uinapp/uin_app_test.go index 84bd4ca5..fc219ddd 100644 --- a/platformapi/uinapp/uin_app_test.go +++ b/platformapi/uinapp/uin_app_test.go @@ -34,7 +34,26 @@ func TestCidSend(t *testing.T) { "push_channel": map[string]interface{}{ "android": map[string]interface{}{ "ups": map[string]interface{}{ - "transmission": "厂商透传消息", + "notification": map[string]interface{}{ + "title": "火车南站店", + "body": "老板，你有新订单了请及时查看（美团#1号订单）", + "click_type": "startapp", // 写 startapp + "notify_id": 1132345, // 每次通知需要不一样 范围：0-2147483647 + }, + "options": map[string]interface{}{ + "XM": map[string]interface{}{ + "/extra.channel_id": "小米的渠道ID", // 订单类填写：108892，消息通知类填写：108898 + }, + "HW": map[string]interface{}{ + "/message/android/category": "填写华为侧的category取值", // 订单类填写：WORK，消息通知类填写：IM + }, + "OP": map[string]interface{}{ + "/channel_id": "填写OPPO平台登记的渠道ID", // 订单类填写：10110，消息通知类填写：10111 + }, + "VV": map[string]interface{}{ + "/category": "填写对应的ID", // 订单类填写：ORDER，消息通知类填写：IM + }, + }, }, }, "ios": map[string]interface{}{ From aebc8600f205ae6ee3112381ca205df9369068a5 Mon Sep 17 00:00:00 2001 From: richboo111 Date: Thu, 6 Jul 2023 15:40:06 +0800 Subject: [PATCH 2/2] 1 --- platformapi/tao_vegetable/store_skuAct.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/platformapi/tao_vegetable/store_skuAct.go b/platformapi/tao_vegetable/store_skuAct.go index 2e134a72..af3049d0 100644 --- a/platformapi/tao_vegetable/store_skuAct.go +++ b/platformapi/tao_vegetable/store_skuAct.go @@ -25,6 +25,7 @@ func (a *API) ActivityCreate(param domain.AlibabaRetailMarketingItemdiscountActi resp, err := act.AlibabaRetailMarketingItemdiscountActivityCreate(&request.AlibabaRetailMarketingItemdiscountActivityCreateRequest{ Param: ¶m, }, a.token) + globals.SugarLogger.Debugf("ActivityCreate:requestId:" + resp.RequestId + "msg:" + *resp.Result.ErrorMessage) if err != nil { return 0, err } @@ -46,6 +47,7 @@ func (a *API) ActivitySkuCreate(param domain.AlibabaRetailMarketingItemdiscountA resp, err := act.AlibabaRetailMarketingItemdiscountActivitySkuAdd(&request.AlibabaRetailMarketingItemdiscountActivitySkuAddRequest{ Param: ¶m, }, a.token) + globals.SugarLogger.Debugf("ActivitySkuCreate:requestId:" + resp.RequestId + "msg:" + *resp.Result.ErrorMessage) if err != nil { return err, nil, *resp.Result.FailedSkuCodes }