Merge branch 'wsy3' into 'master'

fix majia args

See merge request alpha/physical!566

crontab.py

 import random
 
 ontime_list = [
-    "0 9 * * *  source /srv/envs/physical/bin/activate  && python /data/log/physical/app/crontab.py",
-    "10 9 * * *  source /srv/envs/physical/bin/activate  && python  /data/log/physical/app/crontabs.py",
+    "0 8 * * *  source /srv/envs/physical/bin/activate  && python /data/log/physical/app/crontab.py",
+    "10 8 * * *  source /srv/envs/physical/bin/activate  && python  /data/log/physical/app/crontabs.py",
     "0 9 * * * sh /data/log/cybertron/app/statistics_query.sh > /data/log/cybertron/app/statistics_query.log",
     "54 */1 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_click_per_2h_by_post",
     # "*/5 * * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m true_click_one",
@@ -21,11 +21,11 @@ ontime_list = [
     "0 0  * * 3  source /srv/envs/physical/bin/activate  && cd /srv/apps/physical &&  python manage.py  trans2es_mapping2es -m  get_user_id",
     # "0  14,18,22 *  *  *  source /srv/envs/physical/bin/activate  && cd /srv/apps/physical &&  python manage.py  trans2es_mapping2es -m  principal_online_comment1",
     "25 */1 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical &&  python manage.py  trans2es_mapping2es -m auto_reply_per_2h_to_topic",
-    "0 9 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_click_per_1d_by_post",
-    "1 9 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_follow_per_1d_by_regist",
-    "2 9 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_follow_per_1d_by_post",
-    "3 9 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_reply_per_1d_to_pictorial",
-    "4 9 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_reply_per_1d_to_topic"
+    "0 8 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_click_per_1d_by_post",
+    "1 8 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_follow_per_1d_by_regist",
+    "2 8 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_follow_per_1d_by_post",
+    "3 8 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_reply_per_1d_to_pictorial",
+    "4 8 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_reply_per_1d_to_topic"
     # "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m answer_reply1",
     # "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m answer_reply2",
     # "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m answer_reply3",

libs/timelib.py

@@ -23,7 +23,7 @@ def eta_2_push_time(eta):
     return push_time
 
 
-def get_rand_time(hourlow=0, hourup=13, minutelow=0, minuteup=60):
+def get_rand_time(hourlow=0, hourup=15, minutelow=0, minuteup=55):
     hours = random.randint(hourlow, hourup)
     minutes = random.randint(minutelow, minuteup)
     # todo redis会自动给加8个小时，所以这边先写死减少8小时

vest/click/auto_click_per_1d_by_post.py

@@ -57,7 +57,7 @@ def auto_click_per_1d_by_post():
         numtime1, numtime2 = time_convs(1, 1)
         topic_ids = get_commnet_id(numtime2, numtime1, content_level_low=0, content_level_top=3)
         for topic_id in topic_ids:
-            click_num = random.randint(2, 6)
+            click_num = random.randint(3, 6)
             for i in range(click_num):
                 auto_click_list.append(topic_id)
 

vest/follow/auto_follow_per_1d_by_post.py

@@ -45,7 +45,7 @@ def auto_follow_per_1d_by_post():
         numtime1, numtime2 = time_convs(1, 1)
         user_ids = get_commnet_id(numtime2, numtime1, content_level_low=0, content_level_top=3)
         for user_id in user_ids:
-            follow_num = random.randint(2, 6)
+            follow_num = random.randint(3, 6)
             for i in range(follow_num):
                 auto_follow_list.append(user_id)
 

vest/follow/auto_follow_per_1d_by_regist.py

@@ -45,7 +45,7 @@ def auto_follow_per_1d_by_regist():
         numtime1, numtime2 = time_convs(1, 1)
         user_ids= get_commnet_id(numtime2, numtime1)
         for user_id in user_ids:
-            follow_num = random.randint(1, 3)
+            follow_num = random.randint(3, 6)
             for i in range(follow_num):
                 auto_follow_list.append(user_id)
 

vest/reply/auto_reply_per_1d_to_topic.py

@@ -62,7 +62,7 @@ def auto_reply_per_1d_to_topic():
         numtime1, numtime2 = time_convs(1, 1)
         topic_ids = get_data(numtime1, numtime2, 0, 3)
         for topic_id in topic_ids:
-            random_num = random.randint(1, 3)
+            random_num = random.randint(3, 6)
             for num in range(random_num):
                 topic_id_list.append(topic_id)