添加日志

comment/views/auto_comment.py

@@ -13,6 +13,7 @@ logger = logging.getLogger(__name__)
 
 def auto_comment_user(card_info, after_day=False):
     """
+    帖子回答日记都是一样的下发策略
     当天发布之后
 
     2-4小时内随机，给予[0-1]个评论

comment/views/comment_fun.py

@@ -8,7 +8,15 @@ from moment.views.send_email import send_email_tome
 
 
 def comment(card_info):
+    """
+    在这个地方需要区分卡片的类型去调用不同的接口
+    :param card_info:
+    :return:
+    """
     try:
+        rpc_invoker = get_rpc_invoker()
+        ##如果是回答
+        if card_info['type_status'] == 'answer':
             key = "auto_vest_one_user_action:" + str(card_info['card_id'])
             redis_data = redis_client.get(key)
             if redis_data:
@@ -20,16 +28,65 @@ def comment(card_info):
                 redis_data = {"click": 0, "follow": 0, "comment": 1}
                 redis_client.set(key, json.dumps(redis_data))
             redis_client.expire(key, time=24 * 60 * 60)
+
             logging.info("get action:comment,card_id:%s,redis_data:%s" % (card_info['card_id'], redis_data))
             comment_num = redis_data["comment"]
             ####在这里做判断 一天不能超过20个 如果超过二十个不下发  不超过二十个下发对应的灌水功能
             if comment_num > 20:
                 send_email_tome(str(redis_data) + str(card_info))
             else:
-            rpc_invoker = get_rpc_invoker()
+
                 rpc_invoker['qa/irrigation/create_answer_reply'](user_id=card_info['current_user_id'],
                                                                  answer_id=card_info['card_id'],
                                                                  content=card_info['comment_content']).unwrap()
+        if card_info['type_status'] == 'tractate':
+            key = "auto_vest_one_user_action_tractate:" + str(card_info['card_id'])
+            redis_data = redis_client.get(key)
+            if redis_data:
+                redis_data = json.loads(redis_data)
+                click_num = int(redis_data.get("comment")) + 1
+                redis_data['comment'] = click_num
+                redis_client.set(key, json.dumps(redis_data))
+            else:
+                redis_data = {"comment": 1}
+                redis_client.set(key, json.dumps(redis_data))
+            redis_client.expire(key, time=24 * 60 * 60)
+
+            logging.info("get action:comment,card_id:%s,redis_data:%s" % (card_info['card_id'], redis_data))
+
+            comment_num = redis_data["comment"]
+            ####在这里做判断 一天不能超过20个 如果超过二十个不下发  不超过二十个下发对应的灌水功能
+            if comment_num > 20:
+                send_email_tome(str(redis_data) + str(card_info))
+            else:
+                rpc_invoker['qa/irrigation/create_tractate_reply'](user_id=card_info['current_user_id'],
+                                                                   answer_id=card_info['card_id'],
+                                                                   content=card_info['comment_content']).unwrap()
+
+        if card_info['type_status'] == 'diary':
+            key = "auto_vest_one_user_action_diary:" + str(card_info['card_id'])
+            redis_data = redis_client.get(key)
+            if redis_data:
+                redis_data = json.loads(redis_data)
+                click_num = int(redis_data.get("comment")) + 1
+                redis_data['comment'] = click_num
+                redis_client.set(key, json.dumps(redis_data))
+            else:
+                redis_data = {"comment": 1}
+                redis_client.set(key, json.dumps(redis_data))
+            redis_client.expire(key, time=24 * 60 * 60)
+
+            logging.info("get action:comment,card_id:%s,redis_data:%s" % (card_info['card_id'], redis_data))
+
+            comment_num = redis_data["comment"]
+            ####在这里做判断 一天不能超过20个 如果超过二十个不下发  不超过二十个下发对应的灌水功能
+            if comment_num > 20:
+                send_email_tome(str(redis_data) + str(card_info))
+            else:
+                rpc_invoker['qa/irrigation/create_diary_reply'](user_id=card_info['current_user_id'],
+                                                                answer_id=card_info['card_id'],
+                                                                content=card_info['comment_content']).unwrap()
+
         return True
     except:
         logging_exception()

follow/views/auto_follow.py

@@ -92,6 +92,7 @@ def auto_follow_user(card_info, after_day=False):
                 if len(card_info["all_follow_id"]) > 0:
                     card_info['current_push_time'] = card_info['all_push_time'][0]
 
+                logging.info("get-------comment---------------card_info:%s" % card_info)
                 save_data_to_kafka(card_info)  # 存储数据
 
     except:

moment/views/consum.py

@@ -134,7 +134,6 @@ def kafka_consum(topic_name=None):
                                                 is_success = follow(card_info)
                                                 logging.info("当前卡片ID:%s,follow2子函数消费处理耗时:%f" % (
                                                     card_info["card_id"], time.time() - begin))
-
                                                 logging.info("follow [%s,%s,%s,%s],当前ID:%s，下发状状态:%s" % (
                                                     str(msg.topic), str(msg.partition), str(msg.offset), str(msg.key),
                                                     card_info["card_id"], is_success))

moment/views/irrigation.py

@@ -14,6 +14,16 @@ from libs.error import logging_exception
 
 @bind('vest/moment/vest_irrigation')
 def vest_irrigation(card_id=0, card_type=None, card_user_id=None, create_time="", content_level=0, tag_names=[]):
+    '''
+    帖子回答日记都有评论灌水   回答有点赞和关注
+    :param card_id:
+    :param card_type:
+    :param card_user_id:
+    :param create_time:
+    :param content_level:
+    :param tag_names:
+    :return:
+    '''
     try:
 
         producer = KafkaProducer(bootstrap_servers=settings.KAFKA_BROKER_LIST)
@@ -28,47 +38,54 @@ def vest_irrigation(card_id=0, card_type=None, card_user_id=None, create_time=""
                 if i in tag_list:
                     flag = True
 
-        if flag == True:
-            comment_msg_dict = {
+        if card_type == 'answer':
+            ###关注
+            follow_msg_dict = {
                 "card_id": card_id,
+                'type_status': card_type,
                 "card_type": "auto_vest",
                 "create_time": create_time,
                 "content_level": content_level,
                 "tag_names": tag_names,
                 "type": "get_write_answer_userinfo",
                 "current_push_time": create_time,
-                'action_type': 'comment'
+                'action_type': 'follow',
+                'card_user_id': card_user_id
 
             }
-            logging.info("get comment_msg_dict:%s" % comment_msg_dict)
-            producer.send(topic, json.dumps(comment_msg_dict).encode())
+            producer.send(topic, json.dumps(follow_msg_dict).encode())
 
-        follow_msg_dict = {
+            ##点赞
+            click_msg_dict = {
                 "card_id": card_id,
+                'type_status': card_type,
                 "card_type": "auto_vest",
                 "create_time": create_time,
                 "content_level": content_level,
                 "tag_names": tag_names,
                 "type": "get_write_answer_userinfo",
                 "current_push_time": create_time,
-            'action_type': 'follow',
-            'card_user_id': card_user_id
+                'action_type': 'click'
 
             }
-        producer.send(topic, json.dumps(follow_msg_dict).encode())
+            producer.send(topic, json.dumps(click_msg_dict).encode())
 
-        click_msg_dict = {
+        ##当有对应的标签的时候才下发评论
+        if flag == True:
+            comment_msg_dict = {
                 "card_id": card_id,
+                'type_status': card_type,
                 "card_type": "auto_vest",
                 "create_time": create_time,
                 "content_level": content_level,
                 "tag_names": tag_names,
                 "type": "get_write_answer_userinfo",
                 "current_push_time": create_time,
-            'action_type': 'click'
+                'action_type': 'comment'
 
             }
-        producer.send(topic, json.dumps(click_msg_dict).encode())
+            logging.info("get comment_msg_dict:%s" % comment_msg_dict)
+            producer.send(topic, json.dumps(comment_msg_dict).encode())
 
         producer.close()