sc-common-interface 2.7.3__tar.gz → 2.7.5__tar.gz

{sc_common_interface-2.7.3 → sc_common_interface-2.7.5}/PKG-INFO

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

{sc_common_interface-2.7.3 → sc_common_interface-2.7.5}/sc_common_interface/LiveCommonInterface.py

@@ -24,9 +24,7 @@ def delete_relate_post(data):
     env = data["env"]
     headers = data["headers"]
     url = "%s/api/posts/post/sales" % env
-    sales_type = "LIVE"
-    if "sales_type" in data:
-        sales_type = data["sales_type"]
+    sales_type = data.get("sales_type","LIVE")
     param = {"page_num": 1, "page_size": 100, "sales_type": sales_type}
     platform = "facebook"
     post_id = data["post_id"]
@@ -202,10 +200,13 @@ def get_page_info(data):
         platform = info["data"]["relatedPostList"][i]["platform"]
         post_id = info["data"]["relatedPostList"][i]["post_id"]
         group_id = info["data"]["relatedPostList"][i]["group_id"]
+        permalink_url = info["data"]["relatedPostList"][i]["permalink_url"]
         page_info["page_id"] = page_id
         page_info["platform"] = platform
         page_info["post_id"] = post_id
         page_info["group_id"] = group_id
+        page_info["permalink_url"] = permalink_url
+
     elif sales_type.lower() == "post":
         platform_list = jsonpath(info, "$..related_post_list..platform")
         i = platform_list.index(platform.upper())
@@ -213,10 +214,12 @@ def get_page_info(data):
         platform = info["data"]["related_post_list"][i]["platform"]
         post_id = info["data"]["related_post_list"][i]["post_id"]
         group_id = info["data"]["related_post_list"][i]["group_id"]
+        permalink_url = info["data"]["related_post_list"][i]["permalink_url"]
         page_info["page_id"] = page_id
         page_info["platform"] = platform
         page_info["post_id"] = post_id
         page_info["group_id"] = group_id
+        page_info["permalink_url"] = permalink_url
     return page_info
 
 
@@ -227,22 +230,25 @@ def send__live_comment(data):
     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":
-        page_info = get_page_info(data)
-        platform = page_info["platform"]
-        post_id = page_info["post_id"]
-        group_id = page_info["group_id"]
     stamp = int(time.time())
     num = random.randint(100000, 999999)
     user_id = "488864%d" % int(time.time())
     name = "test live%d" % int(time.time())
     comment_id = "%s_%d%d" % (page_id, stamp, num)
     keyword = "接口测试普通留言"
-    user_id = data.get("user_id",user_id)
+    user_id = data.get("user_id", user_id)
     name = data.get("name", name)
     comment_id = data.get("comment_id", comment_id)
     keyword = data.get("keyword", keyword)
+    # sales_type = data.get("sales_type", "live")
+    relationUrl = data.get("relationUrl")
+    if page_id == "" or post_id == "key":
+        page_info = get_page_info(data)
+        platform = page_info["platform"]
+        post_id = page_info["post_id"]
+        group_id = page_info["group_id"]
+        relationUrl = page_info["permalink_url"]
+
 
     body = {"object": "page", "entry": [{"id": page_id, "time": stamp, "changes": [{"field": "feed", "value": {
             "from": {"id": user_id, "name": name},
@@ -261,12 +267,12 @@ def send__live_comment(data):
                    "field": "comments"}]}], "object": "instagram"}
     elif platform.upper() == "FB_GROUP":
         t_time = stamp*1000
-        if "-" in post_id:
+        if "_" in post_id:
             post_id = post_id.split("_")[-1]
         else:
             # print("----")
-            relationUrl = data["relationUrl"]
-            match = re.search(r'groups/(\d+)/posts/(\d+)/', relationUrl)
+            # relationUrl = data["relationUrl"]
+            match = re.search(r'groups/(\d+)/permalink/(\d+)/', relationUrl)
             group_id = match.group(1)
             post_id = match.group(2)
         comment_id = "%d%d" % ( stamp, num)
@@ -274,7 +280,7 @@ 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()
@@ -300,6 +306,7 @@ def send_mc_message(data):
     platform = data.get("platform", "FACEBOOK")
     if page_id=="":
         page_info = get_page_info(data)
+        page_id =  page_info["page_id"]
         platform = page_info["platform"]
         post_id = page_info["post_id"]
         group_id = page_info["group_id"]
@@ -352,10 +359,11 @@ def get_live_info(data):
         if response.status_code==200:
             return response.json()
         else:
+            time.sleep(1)
             count=count+1
             if count>10:
                 print("查询报错：",response)
-                return response
+                return response.content
 
 
 

{sc_common_interface-2.7.3 → sc_common_interface-2.7.5}/sc_common_interface.egg-info/PKG-INFO

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

{sc_common_interface-2.7.3 → sc_common_interface-2.7.5}/setup.py

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