Merge branch 'wsy3' into 'master'

Wsy3

See merge request !537

Makefile

 crontab:
 	cp crontab.py  /data/log/physical/app/crontab.py && python /data/log/physical/app/crontab.py && python  /data/log/physical/app/crontabs.py
 celery:
-	celery -A physical worker -c 1 -Q vest -l debug
+	celery -A physical worker -c 1 -Q tapir-alpha -l debug --max-tasks-per-child == 500

libs/timelib.py

@@ -29,8 +29,8 @@ def get_rand_time(hourlow=0, hourup=13, minutelow=0, minuteup=60):
     # todo redis会自动给加8个小时，所以这边先写死减少8小时
     now_time = NOW + timedelta(hours=hours, minutes=minutes) - timedelta(hours=8)
     time = eta_2_push_time(now_time.strftime("%Y-%m-%d %H:%M:%S"))
-    print(datetime.fromtimestamp(time))
-    return datetime.fromtimestamp(time)
+    print(datetime.fromtimestamp(time, pytz.timezone('Asia/Shanghai')))
+    return datetime.fromtimestamp(time, pytz.timezone('Asia/Shanghai'))
 
 
 if __name__ == '__main__':

vest/request/auto_request.py

@@ -114,7 +114,7 @@ def logins(user_id):
         return None
 
 
-@shared_task
+@shared_task(retry_kwargs={'max_retries': 0})
 def click(cookies_get, id):
     # 点赞
     try:
@@ -148,7 +148,7 @@ def click(cookies_get, id):
         logging.error("catch exception,logins:%s" % traceback.format_exc())
 
 
-@shared_task
+@shared_task(retry_kwargs={'max_retries': 0})
 def reply(cookies_get, id, content):
     try:
         post_dict = {
@@ -272,7 +272,7 @@ def get_comments():
         return None
 
 
-@shared_task
+@shared_task(retry_kwargs={'max_retries': 0})
 def follow(cookies_get, id):
     try:
         post_dict = {
@@ -438,7 +438,7 @@ def set_reply_to_redis():
         logging.error("catch exception,logins:%s" % traceback.format_exc())
 
 
-@shared_task
+@shared_task(retry_kwargs={'max_retries': 0})
 def reply2(cookies_get, id, content, replied_id):
     try:
         post_dict = {
@@ -459,7 +459,7 @@ def reply2(cookies_get, id, content, replied_id):
         logging.error("catch exception,logins:%s" % traceback.format_exc())
 
 
-@shared_task
+@shared_task(retry_kwargs={'max_retries': 0})
 def pictorial_reply(cookies_get, id, content):
     try:
         post_dict = {