Merge branch 'similar_sort' into 'master'

modify maidian

See merge request !149

linucb/views/collect_data.py

@@ -89,7 +89,7 @@ class CollectData(object):
                     raw_val_dict = json.loads(ori_msg.value)
 
                     if "type" in raw_val_dict and "on_click_feed_topic_card" == raw_val_dict["type"]:
-                        topic_id = raw_val_dict["params"]["business_id"]
+                        topic_id = raw_val_dict["params"]["business_id"] or raw_val_dict["params"]["topic_id"]
                         device_id = raw_val_dict["device"]["device_id"]
 
                         logging.info("consume topic_id:%s,device_id:%s" % (str(topic_id), str(device_id)))
@@ -112,7 +112,12 @@ class CollectData(object):
                         # 更新该用户的推荐tag数据，放在 更新完成user tag行为信息之后
                         self.update_recommend_tag_list(device_id, user_feature)
                     elif "type" in raw_val_dict and "page_precise_exposure" == raw_val_dict["type"]:
-                        exposure_cards_list = json.loads(raw_val_dict["params"]["exposure_cards"])
+                        if isinstance(raw_val_dict["params"]["exposure_cards"],str)
+                            exposure_cards_list = json.loads(raw_val_dict["params"]["exposure_cards"])
+                        elif isinstance(raw_val_dict["params"]["exposure_cards"],list)
+                            exposure_cards_list = raw_val_dict["params"]["exposure_cards"]
+                        else:
+                            exposure_cards_list = list()
                         device_id = raw_val_dict["device"]["device_id"]
                         for item in exposure_cards_list:
                             if "card_id" not in item: