Merge branch 'wsy3' into 'test'

Wsy3

See merge request !527

vest/click/auto_click_per_1d_by_post.py

@@ -28,7 +28,7 @@ def get_commnet_id(numtime, numtime2, content_level_low=0, content_level_top=6):
             "SELECT pictorial_id FROM community_pictorial_topic where topic_id=%s limit 1" % i)
 
         pictorial_id = cursor.fetchall()
-        if pictorial_id is not None:
+        if pictorial_id:
             topic_ids.append((i, pictorial_id[0]))
         else:
             topic_ids.append((i, 0))

vest/click/auto_click_per_2h_by_post.py

@@ -29,7 +29,7 @@ def get_commnet_id(numtime, numtime2, content_level_low=0, content_level_top=6):
             "SELECT pictorial_id FROM community_pictorial_topic where topic_id=%s limit 1" % i)
 
         pictorial_id = cursor.fetchall()
-        if pictorial_id is not None:
+        if pictorial_id:
             topic_ids.append((i, pictorial_id[0]))
         else:
             topic_ids.append((i, 0))

vest/reply/auto_reply_per_1d_to_pictorial.py

@@ -38,7 +38,7 @@ def get_data(numtime1, numtime2):
         pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
         cursor = pc.cursor()
         cursor.execute(
-            "SELECT  pictorial_id ,count(*) as count FROM community_pictorial_topic WHERE is_online=1 and (create_time >= '%s' and create_time < '%s') group by pictorial_id " % (
+            "SELECT  pictorial_id FROM community_pictorial_topic WHERE is_online=1 and (create_time >= '%s' and create_time < '%s') group by pictorial_id " % (
                 numtime1, numtime2))
         res = cursor.fetchall()
 
@@ -87,6 +87,9 @@ def auto_reply_per_1d_to_pictorial():
     except:
         logging.error("catch exception,main:%s" % traceback.format_exc())
 
+    logging.info('auto_click_per_2h_by_post: len %s' % len(pictorial_id_list))
+    print('auto_click_per_2h_by_post: len %s' % len(pictorial_id_list))
+
     total = len(pictorial_id_list)
     limit = (total + 10) // 10
     for start in range(0, total, limit):

vest/reply/auto_reply_per_1d_to_topic.py

@@ -14,7 +14,7 @@ def get_data(numtime, numtime2, content_level_low, content_level_top):
         pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
         cursor = pc.cursor()
         cursor.execute(
-            "SELECT  user_id,id FROM topic WHERE is_online=1  and (create_time >= '%s' and create_time <= '%s' )"
+            "SELECT id FROM topic WHERE is_online=1  and (create_time >= '%s' and create_time <= '%s' )"
             "and content_level>= %s and content_level<= %s" % (
                 numtime2, numtime, str(content_level_low), str(content_level_top)))
         res = cursor.fetchall()
@@ -78,6 +78,9 @@ def auto_reply_per_1d_to_topic():
         logging_exception()
         logging.error("catch exception,main:%s" % traceback.format_exc())
 
+    logging.info('auto_click_per_2h_by_post: len %s' % len(topic_id_list))
+    print('auto_click_per_2h_by_post: len %s' % len(topic_id_list))
+
     total = len(topic_id_list)
     limit = (total + 10) // 10
     for start in range(0, total, limit):

vest/reply/auto_reply_per_2h_to_topic.py

@@ -14,7 +14,7 @@ def get_data(numtime, numtime2):
         pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
         cursor = pc.cursor()
         cursor.execute(
-            "SELECT  user_id,id FROM topic WHERE is_online=1  and (create_time >= '%s' and create_time <= '%s' )" % (
+            "SELECT  user_id FROM topic WHERE is_online=1  and (create_time >= '%s' and create_time <= '%s' )" % (
                 numtime2, numtime))
         res = cursor.fetchall()
         return res and [r for r, in res] or []
@@ -50,6 +50,10 @@ def auto_reply_per_2h_to_topic():
         logging_exception()
         logging.error("catch exception,main:%s" % traceback.format_exc())
 
+
+    logging.info('auto_click_per_2h_by_post: len %s' % len(topic_id_list))
+    print('auto_click_per_2h_by_post: len %s' % len(topic_id_list))
+
     total = len(topic_id_list)
     limit = (total + 10) // 10
     for start in range(0, total, limit):