sc-common-interface 2.6.9__tar.gz → 2.7.1__tar.gz

{sc_common_interface-2.6.9 → sc_common_interface-2.7.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sc_common_interface
-Version: 2.6.9
+Version: 2.7.1
 Summary: SC贴文销售公用的接口
 Home-page: UNKNOWN
 Author: river

{sc_common_interface-2.6.9 → sc_common_interface-2.7.1}/sc_common_interface/LiveCommonInterface.py

@@ -194,22 +194,12 @@ def end_activity(data):
 def send__live_comment(data):
     env = data["env"]
     key = data["key"]
-    platform = "FACEBOOK"
-    page_id = ""
-    post_id = ""
-    group_id = ""
 
-    if "page_id" in data:
-        page_id = data['page_id']
-    if "platform" in data:
-        platform = data['platform']
-    if "post_id" in data:
-        post_id = data['post_id']
-    if "group_id" in data:
-        post_id = data['group_id']
-    sales_type = "live"
-    if "sales_type" in data:
-        sales_type = data["sales_type"]
+    page_id = data.get("page_id", "")
+    platform = data.get("platform", "FACEBOOK")
+    post_id = data.get("post_id", "")
+    group_id = data.get("group_id", "")
+    sales_type = data.get("sales_type", "live")
     if page_id == "" or post_id == "key":
         info = get_live_info(data)
         # print("info",info)
@@ -268,7 +258,7 @@ def send__live_comment(data):
         if "-" in post_id:
             post_id = post_id.split("_")[-1]
         else:
-            print("----")
+            # print("----")
             relationUrl = data["relationUrl"]
             match = re.search(r'groups/(\d+)/posts/(\d+)/', relationUrl)
             group_id = match.group(1)
@@ -278,14 +268,14 @@ def send__live_comment(data):
         "from":{"id":user_id,"name":name},"group_id":group_id,"post_id":post_id,"comment_id":comment_id,"created_time":stamp,"item":"comment",
          "verb":"add","parent_id":post_id,"field":"group_feed"}]}]}
 
-    print(body)
+    # print(body)
     url = "%s/facebook/webhook" % env
     sign_text = hmac.new(key.encode("utf-8"), json.dumps(body).encode("utf-8"), sha1)
     signData = sign_text.hexdigest()
     # print("body", json.dumps(body))
     header = {"Content-Type": "application/json", "x-hub-signature": "sha1=%s" % signData}
     response = requests.post(url, headers=header, data=json.dumps(body))
-    print(response.text)
+    # print(response.text)
     return user_id, name, comment_id
 
 def send_mc_message(data):
@@ -293,26 +283,15 @@ def send_mc_message(data):
     key = data["key"]
     stamp = int(time.time()*1000)
     user_id = "488864%d" % int(time.time())
-    type = "commment"
-    payload = "{}"
-    if "payload" in data:
-        payload = data["payload"]
-    if "type" in data:
-        type = data["type"]
-    if "user_id" in data:
-        user_id = data['user_id']
     name = "test live%d" % int(time.time())
-    if "name" in data:
-        name = data['name']
     message = "接口测试普通留言"
-    if "message" in data:
-        message = data['message']
-    page_id = ""
-    if "page_id" in data:
-        page_id = data['page_id']
-    platform = "FACEBOOK"
-    if "platform" in data:
-        platform = data['platform']
+    payload = data.get("payload","{}")
+    type = data.get("type", "commment")
+    user_id = data.get("user_id",user_id)
+    name = data.get("name", name)
+    message = data.get("message", message)
+    page_id = data.get("page_id", "")
+    platform = data.get("platform", "FACEBOOK")
     if page_id=="":
         info = get_live_info(data)
         platform_list = jsonpath(info, "$..relatedPostList..platform")
@@ -331,7 +310,7 @@ def send_mc_message(data):
     #     body = {"entry":[{"id":"%s"%page_id,"messaging":[{"message":
     #     {"mid":"m_hhAqPhSlMTY4En2oWjSB59T3BFjeU97DdDV4WHr3DLWnPrO0iCsjQlG3hBN%d-sBlT26-6oNg"%stamp,"text":"%s"%message},
     #     "recipient":{"id":"%s"%page_id},"sender":{"id":"%s"%user_id},"timestamp":stamp}],"time":stamp}],"object":"page"}
-    if platform.upper()=="INSTAGRAM":
+    if type=="commment" and platform.upper()=="INSTAGRAM":
         body={"object":"instagram","entry":[{"time":stamp,"id":"%s"%page_id,"messaging":[{"sender":{"id":"%s"%user_id},"recipient":{"id":"%s"%page_id},
        "timestamp":stamp,"message":{"mid":"aWdfZAG1faXRlbToxOklHTWVzc2FnZAUlEOjE3ODQxNDUwMzgwODgwNTMzOjM0MDI4MjM2Njg0MTcxMDMwMTI0NDI3NjAyNDExMzcwMDc2NTA5MDozMTgzODU0Mzg3NTY4MDYwMTE3ODUxOTE2MD%d"%stamp,"text":"%s"%message}}]}]}
     elif type=="postback" and platform.upper() in ("FB_GROUP","FACEBOOK"):
@@ -349,7 +328,7 @@ def send_mc_message(data):
     header = {"Content-Type": "application/json", "x-hub-signature": "sha1=%s" % signData}
     response = requests.post(url, headers=header, data=json.dumps(body))
     # print(response.text)
-    print(body)
+    # print(body)
     return user_id, name
 
 
@@ -370,7 +349,7 @@ def get_live_info(data):
         else:
             count=count+1
             if count>10:
-                print("查询报错")
+                print("查询报错：",response)
                 return response
 
 
@@ -460,7 +439,11 @@ def live_search_oa_product(data):
         query = data["query"]
         url = "%s/openApi/proxy/v1/products?page=1&per_page=4&query=%s" % (env,query)
     response = requests.get(url, headers=headers).json()
-    items = response["data"]["items"]
+    global items
+    try:
+        items = response["data"]["items"]
+    except Exception:
+        print("response：", response)
     variant_options_list = jsonpath(items,"$..variations")
     product_info = ""
     spu_id = ""
@@ -2000,11 +1983,7 @@ def add_all_product_set_to_keyword(data):
 
 
 if __name__=="__main__":
-    from sc_common_interface.PostCommonInterface import *
-    data = {'env': 'https://front-admin-preview.shoplineapp.com', 'headers': {'Content-Type': 'application/json', 'authorization': 'Bearer eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJkZmQxYjNiMDc0M2JmYWU4YTFkODk4NzczNjgyZWVkZCIsImRhdGEiOnsibWVyY2hhbnRfaWQiOiI2MWE4N2M5NzYzYjcwYzAwNTEwNmZiZDAiLCJhcHBsaWNhdGlvbl9pZCI6IjVlYjkwMzVhYjA5ZDEyNjU4NTFmOTU2ZiJ9LCJpc3MiOiJodHRwczovL2RldmVsb3BlcnMtcHJldmlldy5zaG9wbGluZWFwcC5jb20iLCJhdWQiOltdLCJzdWIiOiI2MWE4N2M5NzYzYjcwYzAwNTEwNmZiZDAifQ.Y90xLfYVAp9yByHo7Vc7A3hHrp6hX9X9Lg4mg_WiE_I', 'lang': 'en'}, 'platform': 'FB_GROUP', 'sales_id': 542794, 'page_id': '106411048594439', 'relationUrl': 'https://www.facebook.com/groups/3592205981019493/posts/3871576623082426/', 'post_id': ['https://www.facebook.com/groups/3592205981019493/posts/3871576623082426/', 'https://www.facebook.com/groups/3592205981019493/posts/3871571433082945/', 'https://www.facebook.com/groups/3592205981019493/posts/3872673686306053/']}
-    sales_id= create_live(data)
-    data["sales_id"] = sales_id
-    delete_relate_post(data)
+    pass
 
 
 

{sc_common_interface-2.6.9 → sc_common_interface-2.7.1}/sc_common_interface.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sc-common-interface
-Version: 2.6.9
+Version: 2.7.1
 Summary: SC贴文销售公用的接口
 Home-page: UNKNOWN
 Author: river

{sc_common_interface-2.6.9 → sc_common_interface-2.7.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='sc_common_interface',
-    version='2.6.9',
+    version='2.7.1',
     description='SC贴文销售公用的接口',
     author='river',
     packages=find_packages(),