Merge branch 'save_have_xiafa' into 'master'

add

See merge request !19

click/views/click_fun.py

@@ -10,6 +10,21 @@ import datetime
 
 def click(card_info):
     try:
+        key = 'have_reply_answer_click:' + str(card_info['card_id'])
+        redis_data = redis_client.get(key)
+        if redis_data:
+            datas = json.loads(str(redis_data, encoding="utf-8"))
+            if card_info['current_user_id'] in datas:
+                logging.info("当前需要去点赞的用户已经存在了:%s" % card_info)
+                return False
+
+            else:
+                datas.append(card_info['current_user_id'])
+                redis_client.set(key, json.dumps(datas))
+
+        else:
+            conent = [card_info['current_user_id']]
+            redis_client.set(key, json.dumps(conent))
 
         today = datetime.datetime.now()
         str_today = str(today.year) + str(today.month) + str(today.day)

comment/views/comment_fun.py

@@ -111,8 +111,8 @@ def comment(card_info):
                 if redis_data:
                     datas = json.loads(str(redis_data, encoding="utf-8"))
                     if card_info['comment_content'] in datas:
-                        logging.info("当前评论和当前的用户已经存在了")
-                        return True
+                        logging.info("当前评论和当前的用户已经存在了:%s" % card_info)
+                        return False
 
                     else:
                         datas.append(card_info['comment_content'])

follow/views/follow_fun.py

@@ -10,6 +10,22 @@ import datetime
 
 def follow(card_info):
     try:
+        key = 'have_reply_answer_follow:' + str(card_info['card_id'])
+        redis_data = redis_client.get(key)
+        if redis_data:
+            datas = json.loads(str(redis_data, encoding="utf-8"))
+            if card_info['current_user_id'] in datas:
+                logging.info("当前需要去关注的用户已经存在了:%s" % card_info)
+                return False
+
+            else:
+                datas.append(card_info['current_user_id'])
+                redis_client.set(key, json.dumps(datas))
+
+        else:
+            conent = [card_info['current_user_id']]
+            redis_client.set(key, json.dumps(conent))
+
         today = datetime.datetime.now()
         str_today = str(today.year) + str(today.month) + str(today.day)
         key = "auto_vest_action_follow_answer:" + str(card_info['card_id'])

moment/views/consum.py

@@ -115,7 +115,8 @@ def kafka_consum(topic_name=None):
                                                     logging.info("当前卡片ID:%s,comment2子函数消费处理耗时:%f" % (
                                                         card_info['card_id'], time.time() - begin))
                                                 # 调完接口后需要再次去拿新的push_time的时间
-                                                auto_comment_user(card_info)
+                                                if is_success:
+                                                    auto_comment_user(card_info)
 
                                             elif action_type == "click":  # 在这里去调点赞的接口
                                                 if 'have_click_number' in card_info:
@@ -129,7 +130,9 @@ def kafka_consum(topic_name=None):
                                                         card_info["card_id"], is_success))
                                                     logging.info("当前卡片ID:%s,click2子函数消费处理耗时:%f" % (
                                                         card_info["card_id"], time.time() - begin))
-                                                auto_click_user(card_info)
+
+                                                if is_success:
+                                                    auto_click_user(card_info)
 
                                             elif action_type == "follow":  # 在这里去调关注的接口
                                                 if 'have_follow_number' in card_info:
@@ -144,7 +147,8 @@ def kafka_consum(topic_name=None):
                                                         str(msg.topic), str(msg.partition), str(msg.offset),
                                                         str(msg.key),
                                                         card_info["card_id"], is_success))
-                                                auto_follow_user(card_info)
+                                                if is_success:
+                                                    auto_follow_user(card_info)
                             else:  # push_time时间未到 需要等待
                                 logging.info("follow [%s,%s,%s,%s],push_time未到,需要等待" % (
                                     str(msg.topic), str(msg.partition), str(msg.offset), str(msg.key)))