Merge branch 'wsy' into 'test'

fix auto_follow_per_5m_by_followed

See merge request alpha/physical!515

vest/follow/auto_follow_per_5m_by_followed.py

@@ -3,7 +3,7 @@ import traceback
 import logging
 from vest.request.auto_request import login, follow, time_conv
 from vest.request.auto_request import host, user, db, passwd
-from vest.data.majia_user_ids import majia_user_ids_list
+from vest.data.majia_user_ids import majia_user_ids_list, majia_user_ids_dict
 from libs.error import logging_exception
 
 
@@ -12,7 +12,7 @@ def get_user_id(numtime):
     cursor = pc.cursor()
     majia_user_ids_tuple = tuple(majia_user_ids_list)
     cursor.execute(
-        "SELECT  user_id FROM user_follow WHERE  create_time > '%s' and follow_id in %s " % (numtime, str(majia_user_ids_tuple))
+        "SELECT  user_id, follow_id FROM user_follow WHERE  create_time > '%s' and follow_id in %s " % (numtime, str(majia_user_ids_tuple))
     )
     data_comment = cursor.fetchall()
     return data_comment and [i for i in data_comment] or []
@@ -22,10 +22,11 @@ def auto_follow_per_5m_by_followed():
     # 如果马甲被用户关注，马甲即反向关注用户, 被关注5分钟后
     try:
         numtime1, numtime2 = time_conv(1, 5)
-        user_ids = get_user_id(numtime2)
+        users = get_user_id(numtime2)
         try:
-            for user_id in user_ids and user_ids:
-                cookies = login()
+            for user in users and users:
+                user_id = user[0]
+                cookies = login(majia_user_ids_dict.get(user[1]))
                 if cookies is not None:
                     follow(cookies, user_id)
         except:

vest/request/auto_request.py

@@ -82,9 +82,10 @@ def get_cookies(user_id):
         return None
 
 
-def login():
+def login(user_id=None):
     try:
-        user_id = get_majia()
+        if not user_id:
+            user_id = get_majia()
         logging.info("get user_id:%s" % user_id)
 
         cookies = get_cookies(user_id)