diff --git a/Utils/webhook_handler.py b/Utils/webhook_handler.py index 4742fafb13eaa25d09a0dccba2666b84b5ef0d5c..f2fa96ba1c9175c1b89e302193e1b531d8594151 100644 --- a/Utils/webhook_handler.py +++ b/Utils/webhook_handler.py @@ -8,16 +8,16 @@ import urllib.parse timestamp = str(round(time.time() * 1000)) -secret = 'SEC7c41f8b0298b348ed538883c49068185b75c510d64dcb988fc570cb7614f07ff' #正式的webhook -# secret = 'SEC9d91939234e83369cba32c0ca4bcd9af60b5b1f69424d6fabd36f48d572a151c' #测试用的webhook +# secret = 'SEC7c41f8b0298b348ed538883c49068185b75c510d64dcb988fc570cb7614f07ff' #正式的webhook +secret = 'SEC9d91939234e83369cba32c0ca4bcd9af60b5b1f69424d6fabd36f48d572a151c' #测试用的webhook secret_enc = secret.encode('utf-8') string_to_sign = '{}\n{}'.format(timestamp, secret) string_to_sign_enc = string_to_sign.encode('utf-8') hmac_code = hmac.new(secret_enc, string_to_sign_enc, digestmod=hashlib.sha256).digest() sign = urllib.parse.quote_plus(base64.b64encode(hmac_code)) -# webhook_url = 'https://oapi.dingtalk.com/robot/send?access_token=22fda27990b00841c3201c20649c0a8abb6da82d8472b6f6154ef4cd9dadb33f' #测试用的webhook -webhook_url = 'https://oapi.dingtalk.com/robot/send?access_token=c7d3c3a67db4cf7b3472e62005a25ce202daac8095f32530687afdb91f1616b6' #正式的webhook +webhook_url = 'https://oapi.dingtalk.com/robot/send?access_token=22fda27990b00841c3201c20649c0a8abb6da82d8472b6f6154ef4cd9dadb33f' #测试用的webhook +# webhook_url = 'https://oapi.dingtalk.com/robot/send?access_token=c7d3c3a67db4cf7b3472e62005a25ce202daac8095f32530687afdb91f1616b6' #正式的webhook class webhookHandler: def __init__(self,webhookUrl = f"{webhook_url}×tamp={timestamp}&sign={sign}"): diff --git a/YamlCase/setting/shopifyIntegration.yaml b/YamlCase/setting/shopifyIntegration.yaml index 71605dc7f878b311f4b0aa967c0e46e72b337241..0d5daf4b6e5e4d00c7db4f147960d27abfa9d2be 100644 --- a/YamlCase/setting/shopifyIntegration.yaml +++ b/YamlCase/setting/shopifyIntegration.yaml @@ -134,3 +134,19 @@ api14: - eq: {"$.code": 0 } - eq: {"$.data.brandName": "${brandName}" } +api15: + title: 检查集成数量 + url: /api/v1/resource/getResourceCount + method: post + data: {"v":"${v}"} + before_sql: setting/shopifyIntegration/shopifyIntegration_integration_num_select.py + expected: + - eq: {"$.code" : 0} + - eq: {"$.data.list[?(@.resourceName == 'ShopifyShop')].success": "${shopify_shop_num}"} + - eq: {"$.data.list[?(@.resourceName == 'JsShop')].success": "${js_shop_num}"} + - eq: {"$.data.list[?(@.resourceName == 'Messenger')].success": "${facebook_shop_num}"} + - eq: {"$.data.list[?(@.resourceName == 'Email')].success": "${email_shop_num}"} + - eq: {"$.data.list[?(@.resourceName == 'Instagram')].success": "${ins_shop_num}"} + - eq: {"$.data.list[?(@.resourceName == 'Whatsapp')].success": "${whatsapp_shop_num}"} + - eq: {"$.data.list[?(@.resourceName == 'Macro')].success": "${macro_num}"} + diff --git a/YamlCase/setting/tag.yaml b/YamlCase/setting/tag.yaml index a9f4239b2f28b7a69da8dbda3350aa992e244a2c..b42e9ec954d3e01ec7ed87e4d9d731ae3c69274e 100644 --- a/YamlCase/setting/tag.yaml +++ b/YamlCase/setting/tag.yaml @@ -89,7 +89,7 @@ api10: title: 搜索会话标签 url: /api/v1/chat/local/roomList method: post - data: {"uid":"${userId}","uType":2,"platform":1,"siteIds":["${shopId}"],"status":1,"page":1,"pageSize":20,"sortName":"all","keyword":"${new_tag_name}","roomSearchExpArgs":{"searchDime":1,"searchId":""},"v":"${v}"} + data: {"uid":"${userId}","uType":2,"platform":1,"siteIds":["${shopId}"],"status":1,"page":1,"pageSize":50,"sortName":"all","keyword":"${new_tag_name}","roomSearchExpArgs":{"searchDime":1,"searchId":""},"v":"${v}"} expected: - eq: {"$.code": 0} - in_list: {"data.list[*].roomId": "${room_id}"} @@ -99,7 +99,7 @@ api11: title: 搜索用户标签 url: /api/v1/chat/local/roomList method: post - data: {"uid":"${userId}","uType":2,"platform":1,"siteIds":["${shopId}"],"status":1,"page":1,"pageSize":20,"sortName":"all","keyword":"${new_tag_name}","roomSearchExpArgs":{"searchDime":2,"searchId":""},"v":"${v}"} + data: {"uid":"${userId}","uType":2,"platform":1,"siteIds":["${shopId}"],"status":1,"page":1,"pageSize":50,"sortName":"all","keyword":"${new_tag_name}","roomSearchExpArgs":{"searchDime":2,"searchId":""},"v":"${v}"} expected: - eq: {"$.code": 0} - in_list: {"data.list[*].roomId": "${room_id}"} @@ -109,7 +109,7 @@ api12: title: 搜索标签 - all url: /api/v1/chat/local/roomList method: post - data: {"uid":"${userId}","uType":2,"platform":1,"siteIds":["${shopId}"],"status":1,"page":1,"pageSize":20,"sortName":"all","keyword":"${new_tag_name}","roomSearchExpArgs":{"searchDime":0,"searchId":""},"v":"${v}"} + data: {"uid":"${userId}","uType":2,"platform":1,"siteIds":["${shopId}"],"status":1,"page":1,"pageSize":50,"sortName":"all","keyword":"${new_tag_name}","roomSearchExpArgs":{"searchDime":0,"searchId":""},"v":"${v}"} expected: - eq: {"$.code": 0} - in_list: {"$.data.list[*].roomId": "${room_id}"}