Merge branch 'wsy3' into like-pre/r01

libs/timelib.py

@@ -29,7 +29,9 @@ 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__':
+    get_rand_time()

physical/celery_task_router.py

@@ -9,8 +9,6 @@ class CeleryTaskRouter(object):
     queue_task_map = {
         "tapir-alpha": [
             'injection.data_sync.tasks.write_to_es',
-        ],
-        "vest": [
             'vest.request.auto_request.click',
             'vest.request.auto_request.reply',
             'vest.request.auto_request.follow',

vest/request/__init__.py

+from .auto_request import *
\ No newline at end of file