Skip to content

P
physical
Commit f200946b authored by 吴升宇's avatar 吴升宇
Browse files
Options

Merge branch 'wsy3' into 'master' 

fix celery timezone

See merge request alpha/physical!553
parents aa264a78 29407cf9
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
libs/timelib.py
View file @ f200946b
...@@ -27,7 +27,7 @@ def get_rand_time(hourlow=0, hourup=13, minutelow=0, minuteup=60): ...@@ -27,7 +27,7 @@ def get_rand_time(hourlow=0, hourup=13, minutelow=0, minuteup=60):
hours = random.randint(hourlow, hourup) hours = random.randint(hourlow, hourup)
minutes = random.randint(minutelow, minuteup) minutes = random.randint(minutelow, minuteup)
# todo redis会自动给加8个小时，所以这边先写死减少8小时 # todo redis会自动给加8个小时，所以这边先写死减少8小时
now_time = NOW + timedelta(hours=hours, minutes=minutes) - timedelta(hours=8) now_time = NOW + timedelta(hours=hours, minutes=minutes)
time = eta_2_push_time(now_time.strftime("%Y-%m-%d %H:%M:%S")) time = eta_2_push_time(now_time.strftime("%Y-%m-%d %H:%M:%S"))
print(datetime.fromtimestamp(time, pytz.timezone('Asia/Shanghai'))) print(datetime.fromtimestamp(time, pytz.timezone('Asia/Shanghai')))
return datetime.fromtimestamp(time, pytz.timezone('Asia/Shanghai')) return datetime.fromtimestamp(time, pytz.timezone('Asia/Shanghai'))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment