Merge branch 'test' of git.wanmeizhensuo.com:alpha/physical into test

vest/reply/auto_reply_per_1d_to_topic.py

@@ -42,7 +42,8 @@ def batch_handle(topic_id_list):
                     response = reply_answer(cookies, topic_id, comment1)
                     response = json.loads(response)
                     cookies = login()
-                    reply_id = response["data"]["id"]
+                    reply_id = response["data"].get('id')
+                    if reply_id:
                         time = get_rand_time()
                         reply2.apply_async(args=(cookies, topic_id, comment2, reply_id), eta=time)
 

vest/reply/auto_reply_per_2h_to_topic.py

@@ -41,7 +41,8 @@ def batch_handle(topic_id_list):
                     response = reply_answer(cookies, topic_id, comment1)
                     response = json.loads(response)
                     cookies = login()
-                    reply_id = response["data"]["id"]
+                    reply_id = response["data"].get('id')
+                    if reply_id:
                         time = get_rand_time(hourup=0)
                         reply2.apply_async(args=(cookies, topic_id, comment2, reply_id), eta=time)
 

vest/request/auto_request.py

@@ -116,13 +116,13 @@ def logins(user_id):
 
 @shared_task(retry_kwargs={'max_retries': 0})
 def click(cookies_get, id):
-    click_key = 'click topic_id:%s, cookies_get: %s' % (cookies_get, id)
+    click_key = 'click topic_id:%s, cookies_get: %s' % (str(cookies_get), str(id))
     cache_count = click_cache.get(click_key)
     if cache_count:
         return
     else:
         click_cache.set(click_key, 1)
-        click_cache.expire(click_key, settings.cache_seconds)
+        click_cache.expire(click_key, settings.CACHE_SECONDS)
 
     # 点赞
     try:
@@ -158,13 +158,13 @@ def click(cookies_get, id):
 
 @shared_task(retry_kwargs={'max_retries': 0})
 def reply(cookies_get, id, content):
-    reply_key = 'click topic_id:%s, cookies_get: %s, content:%s' % (id, cookies_get, content)
+    reply_key = 'click topic_id:%s, cookies_get: %s, content:%s' % (str(id), str(cookies_get), str(content))
     cache_count = reply_cache.get(reply_key)
     if cache_count:
         return
     else:
         reply_cache.set(reply_key, 1)
-        reply_cache.expire(reply_key, settings.cache_seconds)
+        reply_cache.expire(reply_key, settings.CACHE_SECONDS)
     try:
         post_dict = {
             'topic_id': id,
@@ -289,13 +289,13 @@ def get_comments():
 
 @shared_task(retry_kwargs={'max_retries': 0})
 def follow(cookies_get, id):
-    follow_key = 'click user_id:%s, cookies_get: %s' % (id, cookies_get)
+    follow_key = 'click user_id:%s, cookies_get: %s' % (str(id), str(cookies_get))
     cache_count = follow_cache.get(follow_key)
     if cache_count:
         return
     else:
         follow_cache.set(follow_key, 1)
-        follow_cache.expire(follow_key, settings.cache_seconds)
+        follow_cache.expire(follow_key, settings.CACHE_SECONDS)
     try:
         post_dict = {
             'type': 1,
@@ -462,13 +462,14 @@ def set_reply_to_redis():
 
 @shared_task(retry_kwargs={'max_retries': 0})
 def reply2(cookies_get, id, content, replied_id):
-    reply_key = 'click topic_id:%s, cookies_get: %s, content:%s' % (id, cookies_get, content)
+    reply_key = 'click topic_id:%s, cookies_get: %s, content:%s, replied_id: %s' % \
+                (str(id), str(cookies_get), str(content), str(replied_id))
     cache_count = reply_cache.get(reply_key)
     if cache_count:
         return
     else:
         reply_cache.set(reply_key, 1)
-        reply_cache.expire(reply_key, settings.cache_seconds)
+        reply_cache.expire(reply_key, settings.CACHE_SECONDS)
     try:
         post_dict = {
             'topic_id': id,
@@ -490,13 +491,13 @@ def reply2(cookies_get, id, content, replied_id):
 
 @shared_task(retry_kwargs={'max_retries': 0})
 def pictorial_reply(cookies_get, id, content):
-    reply_key = 'click topic_id:%s, cookies_get: %s, content:%s' % (id, cookies_get, content)
+    reply_key = 'click topic_id:%s, cookies_get: %s, content:%s' % (str(id), str(cookies_get), str(content))
     cache_count = reply_cache.get(reply_key)
     if cache_count:
         return
     else:
         reply_cache.set(reply_key, 1)
-        reply_cache.expire(reply_key, settings.cache_seconds)
+        reply_cache.expire(reply_key, settings.CACHE_SECONDS)
     try:
         post_dict = {
             'pictorial_id': id,