Merge branch 'master' into pictorial_real_data

vest/pictorial/no_reply_principal.py

@@ -15,12 +15,15 @@ def get_data():
         print("....")
         pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
         cursor = pc.cursor()
-        cursor.execute(
-            "select creator_id,id from community_pictorial where is_online =True and is_deleted=False and id not in (select pictorial_id from reply group by pictorial_id)")
+        cursor.execute("select count(*),pictorial_id from reply group by pictorial_id")
         data = cursor.fetchall()
         topic_id = list(data)
+        data_all = []
+        for i in topic_id:
+            if i[0] <= 4:
+                data_all.append(i)
         logging.info("Database version : %s " % topic_id)
-        return topic_id
+        return data_all
 
     except:
         logging.error("catch exception,get_data:%s" % traceback.format_exc())
@@ -31,9 +34,9 @@ def no_reply_principal():
     try:
         logging.info("comment offline  pictorial")
         user_id = get_data()
-        dicts = {}
         for i in user_id:
-            for num in range(4):
+            follow_num = random.randint(1, 5)
+            for num in range(follow_num):
                 majia_user_id = get_majia_reply(i[0])
                 cook = logins(majia_user_id)
                 comment = get_pictorial_comment()