Merge branch 'wsy1' into 'test'

add crontab.py

See merge request !519

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 9 * * * sh /data/log/cybertron/app/statistics_query.sh > /data/log/cybertron/app/statistics_query.log",
+    "*/5 * * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m true_click_one",
+    "02,12,22,32,42,52  * * * *   source /srv/envs/physical/bin/activate  && cd /srv/apps/physical &&  python manage.py  trans2es_mapping2es-m true_click_two",
+    "00,10,20,30,40,50  * * * *  source /srv/envs/physical/bin/activate  && cd /srv/apps/physical &&  python manage.py  trans2es_mapping2es -m true_click_three",
+    "02,12,22,32,42,52  * * * *   source /srv/envs/physical/bin/activate  && cd /srv/apps/physical &&  python manage.py  trans2es_mapping2es-m true_click_four",
+    "06,16,26,36,46,56  * * * *  source /srv/envs/physical/bin/activate  && cd /srv/apps/physical &&  python manage.py  trans2es_mapping2es -m true_click_five",
+    "0 14 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_star_urge",
+    "0 10 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_urge1",
+    "30 10 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_urge2",
+    "0 10 * * 3 source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_lunch_app",
+    "30  10 * * 3 source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_lunch_app2",
+    "*/5 * * * 1 source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_follow_per_5m_by_followed",
+    "1 */2 * * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_follow_per_2h_by_post_and_regist",
+    "0 9  * * *  source /srv/envs/physical/bin/activate  && cd /srv/apps/physical &&   python manage.py  trans2es_mapping2es -m  get_login_session",
+    "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"
+
+]
+
+random_time_list = [
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_follow_per_1d_by_regist",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m auto_follow_per_1d_by_post",
+    "* * * 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",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m answer_reply5",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m answer_reply7",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m yesterday_topic_reply",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m before_yesterday_topic_reply",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m three_days_ago_topic_reply",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m five_days_ago_topic_reply",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m seven_days_ago_reply",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m reply_comment1",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m reply_comment3",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m reply_comment2",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m reply_comment5",
+    "* * * source /srv/envs/physical/bin/activate  && cd /srv/apps/physical && python manage.py  trans2es_mapping2es -m reply_comment7"]
+
+
+
+###随机生成10-23的一个数字 代表小时
+ss1 = random.choices(range(10, 23), k=100)
+###随机生成1-60的一个数字  表示分钟
+ss2 = random.choices(range(1, 50), k=100)
+
+
+for i in range(len(random_time_list)):
+    ontime_list.append(str(ss2[i]) + " " + str(ss1[i]) + " " + str(random_time_list[i]))
+
+data = open("/data/log/physical/app/conf.txt", "w")
+for var in ontime_list:
+    data.write(var)
+    data.write("\n")

vest/follow/auto_follow_per_5m_by_followed.py

@@ -11,7 +11,7 @@ def get_user_id(numtime):
     pc = pymysql.connect(host=host, user=user, passwd=passwd, db=db, port=3306)
     cursor = pc.cursor()
     cursor.execute(
-        "SELECT  f.user_id, f.follow_id FROM user_follow f left join user_extra on f.follow_id = e.user_id "
+        "SELECT  f.user_id, f.follow_id FROM user_follow f left join user_extra e on f.follow_id = e.user_id "
         "WHERE f.create_time >= '%s' and e.is_shadow = 1 " % numtime
     )
     data_comment = cursor.fetchall()
@@ -26,7 +26,7 @@ def auto_follow_per_5m_by_followed():
         try:
             for user in users and users:
                 user_id = user[0]
-                cookies = login(str(majia_user_ids_dict.get(user[1])))
+                cookies = login(str(majia_user_ids_dict.get(str(user[1]))))
                 if cookies is not None:
                     follow(cookies, user_id)
         except:

vest/test.py

@@ -119,16 +119,34 @@ def get_commnet_id(numtime, numtime2):
 
 
 
-def time_conv_minute(minutest, minutest2):
-    try:
-        now = datetime.datetime.now()
-        minute = datetime.datetime.now().minute
-        yes_time = now - datetime.timedelta(minutes=minutest)
-        yes_time2 = now - datetime.timedelta(minutes=minutest2)
-        return yes_time, yes_time2, minute
-    except:
-        return None
+# def time_conv_minute(minutest, minutest2):
+#     try:
+#         now = datetime.datetime.now()
+#         minute = datetime.datetime.now().minute
+#         yes_time = now - datetime.timedelta(minutes=minutest)
+#         yes_time2 = now - datetime.timedelta(minutes=minutest2)
+#         return yes_time, yes_time2, minute
+#     except:
+#         return None
+#
+# a, b, c = time_conv_minute(0, 5)
+#
+# print(a, b)
+
+
+import requests
+auto_follow_url = 'http://earth.gmapp.env/api/v1/follow'
+
+
+def follow(cookies_get, id):
+    post_dict = {
+        'type': 1,
+        'id': id
+    }
+    response = requests.post(url=auto_follow_url,
+                             cookies=cookies_get,
+                             data=post_dict)
+    print(response.text)
 
-a, b, c = time_conv_minute(0, 5)
 
-print(a, b)
\ No newline at end of file
+follow({'sessionid': 'qsukyafj7ub2f43f33g2jm0kkvqf0sa7'}, 241765445)