:art: TimeConvert local_string utc_dt
huangqimin
共有 9 个文件被更改，包括 16 次插入 和 17 次删除
+ 1
- 1
account/models.py
@@ -483,7 +483,7 @@ class UserInfo(BaseModelMixin, LensmanTypeBoolMixin): |
||
| 483 | 483 |
'subscribe': self.subscribe, |
| 484 | 484 |
'membercardid': self.membercardid, |
| 485 | 485 |
'memberusercardcode': self.memberusercardcode, |
| 486 |
- 'created_at': tc.local_string(self.created_at, format='%Y-%m-%d'), |
|
| 486 |
+ 'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d'), |
|
| 487 | 487 |
|
| 488 | 488 |
# 会员信息 |
| 489 | 489 |
'integral': self.integral, |
+ 2
- 2
coupon/models.py
@@ -131,8 +131,8 @@ class UserCouponInfo(BaseModelMixin): |
||
| 131 | 131 |
'coupon_value': self.coupon_value, |
| 132 | 132 |
'coupon_image_url': self.coupon_image_url, |
| 133 | 133 |
'is_coupon_admin_writeoff': self.is_coupon_admin_writeoff, |
| 134 |
- 'active_at': tc.local_string(self.active_at, format='%Y%m%d'), |
|
| 135 |
- 'expire_at': tc.local_string(self.expire_at, format='%Y-%m-%d'), |
|
| 134 |
+ 'active_at': tc.local_string(utc_dt=self.active_at, format='%Y%m%d'), |
|
| 135 |
+ 'expire_at': tc.local_string(utc_dt=self.expire_at, format='%Y-%m-%d'), |
|
| 136 | 136 |
'coupon_valid_period': self.coupon_valid_period, |
| 137 | 137 |
'coupon_limit_model_ids': self.coupon_limit_model_ids, |
| 138 | 138 |
'has_actived': self.has_actived, |
+ 0
- 1
kodo/settings.py
@@ -86,7 +86,6 @@ MIDDLEWARE = ( |
||
| 86 | 86 |
'django.middleware.common.CommonMiddleware', |
| 87 | 87 |
# 'django.middleware.csrf.CsrfViewMiddleware', |
| 88 | 88 |
'django.contrib.auth.middleware.AuthenticationMiddleware', |
| 89 |
- 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', |
|
| 90 | 89 |
'django.contrib.messages.middleware.MessageMiddleware', |
| 91 | 90 |
'django.middleware.clickjacking.XFrameOptionsMiddleware', |
| 92 | 91 |
'django.middleware.security.SecurityMiddleware', |
+ 5
- 5
mch/models.py
@@ -337,7 +337,7 @@ class ModelCameraBodyInfo(BaseModelMixin): |
||
| 337 | 337 |
def final_camera_market_time(self): |
| 338 | 338 |
if not self.camera_market_time: |
| 339 | 339 |
return '' |
| 340 |
- return tc.local_string(self.camera_market_time, format='%Y-%m-%d') |
|
| 340 |
+ return tc.local_string(utc_dt=self.camera_market_time, format='%Y-%m-%d') |
|
| 341 | 341 |
|
| 342 | 342 |
@property |
| 343 | 343 |
def data(self): |
@@ -693,7 +693,7 @@ class ConsumeInfoSubmitLogInfo(BaseModelMixin): |
||
| 693 | 693 |
'serialNo': self.serialNo, |
| 694 | 694 |
'integral': model_info.shot_member_integral, |
| 695 | 695 |
'dupload': self.dupload, |
| 696 |
- 'created_at': tc.local_string(self.created_at, format='%Y-%m-%d'), |
|
| 696 |
+ 'created_at': tc.local_string(utc_dt=self.created_at, format='%Y-%m-%d'), |
|
| 697 | 697 |
} |
| 698 | 698 |
|
| 699 | 699 |
|
@@ -737,9 +737,9 @@ class ActivityInfo(BaseModelMixin): |
||
| 737 | 737 |
final_expire_at = self.final_expire_at(created_at=created_at) |
| 738 | 738 |
if not final_expire_at: |
| 739 | 739 |
return '' |
| 740 |
- y = tc.local_string(final_expire_at, format='%Y') |
|
| 741 |
- m = tc.local_string(final_expire_at, format='%m') |
|
| 742 |
- d = tc.local_string(final_expire_at, format='%d') |
|
| 740 |
+ y = tc.local_string(utc_dt=final_expire_at, format='%Y') |
|
| 741 |
+ m = tc.local_string(utc_dt=final_expire_at, format='%m') |
|
| 742 |
+ d = tc.local_string(utc_dt=final_expire_at, format='%d') |
|
| 743 | 743 |
return u'{}年{}月{}日'.format(y, m, d)
|
| 744 | 744 |
|
| 745 | 745 |
def has_unexpired_activity(self, model_name): |
+ 2
- 2
member/models.py
@@ -330,7 +330,7 @@ class MemberActivityInfo(BaseModelMixin): |
||
| 330 | 330 |
'activity_id': self.activity_id, |
| 331 | 331 |
'title': self.title, |
| 332 | 332 |
'subtitle': self.subtitle, |
| 333 |
- 'date': tc.local_string(self.date, format='%Y-%m-%d'), |
|
| 333 |
+ 'date': tc.local_string(utc_dt=self.date, format='%Y-%m-%d'), |
|
| 334 | 334 |
'city': self.city, |
| 335 | 335 |
'location': self.location, |
| 336 | 336 |
'lat': self.lat, |
@@ -350,7 +350,7 @@ class MemberActivityInfo(BaseModelMixin): |
||
| 350 | 350 |
'activity_id': self.activity_id, |
| 351 | 351 |
'title': self.title, |
| 352 | 352 |
'subtitle': self.subtitle, |
| 353 |
- 'date': tc.local_string(self.date, format='%Y-%m-%d'), |
|
| 353 |
+ 'date': tc.local_string(utc_dt=self.date, format='%Y-%m-%d'), |
|
| 354 | 354 |
'city': self.city, |
| 355 | 355 |
'location': self.location, |
| 356 | 356 |
'lat': self.lat, |
+ 2
- 2
requirements.txt
@@ -1,4 +1,4 @@ |
||
| 1 |
-CodeConvert==2.0.5 |
|
| 1 |
+CodeConvert==3.0.2 |
|
| 2 | 2 |
Pillow==5.0.0 |
| 3 | 3 |
StatusCode==1.0.0 |
| 4 | 4 |
TimeConvert==1.5.1 |
@@ -7,7 +7,7 @@ isoweek==1.3.3 |
||
| 7 | 7 |
jsonfield==2.0.2 |
| 8 | 8 |
mock==2.0.0 |
| 9 | 9 |
monetary==1.0.3 |
| 10 |
-mysqlclient==1.4.5 |
|
| 10 |
+mysqlclient==1.4.6 |
|
| 11 | 11 |
pysnippets==1.1.2 |
| 12 | 12 |
qiniu==7.2.6 |
| 13 | 13 |
requests==2.21.0 |
+ 1
- 1
requirements_deploy.txt
@@ -1,3 +1,3 @@ |
||
| 1 | 1 |
ipdb==0.11 |
| 2 | 2 |
ipython==5.8.0 |
| 3 |
-uwsgi==2.0.17 |
|
| 3 |
+uwsgi==2.0.18 |
+ 2
- 2
requirements_dj.txt
@@ -1,9 +1,9 @@ |
||
| 1 |
-Django==1.11.26 |
|
| 1 |
+Django==1.11.29 |
|
| 2 | 2 |
django-admin==2.0.1 |
| 3 | 3 |
django-cors-headers==3.0.2 |
| 4 | 4 |
django-curtail-uuid==1.0.4 |
| 5 | 5 |
django-daterange-filter==1.3.0 |
| 6 |
-django-detect==1.0.17 |
|
| 6 |
+django-detect==1.0.18 |
|
| 7 | 7 |
django-file-md5==1.0.3 |
| 8 | 8 |
django-file-upload==1.1.1 |
| 9 | 9 |
django-ip==1.0.2 |
+ 1
- 1
requirements_pywe.txt
@@ -8,7 +8,7 @@ pywe-custom-message==1.0.1 |
||
| 8 | 8 |
pywe-miniapp==1.1.5 |
| 9 | 9 |
pywe-oauth==1.1.1 |
| 10 | 10 |
pywe-pay==1.0.13 |
| 11 |
-pywe-pay-notify==1.0.4 |
|
| 11 |
+pywe-pay-notify==1.0.5 |
|
| 12 | 12 |
pywe-response==1.0.1 |
| 13 | 13 |
pywe-sign==1.1.0 |
| 14 | 14 |
pywe-wxa-cv==1.0.0 |