@@ -222,6 +222,7 @@ WECHAT = { |
||
222 | 222 |
'token': '5201314', |
223 | 223 |
'appID': '', |
224 | 224 |
'appsecret': '', |
225 |
+ 'encodingaeskey': '', |
|
225 | 226 |
'mchID': '', |
226 | 227 |
'apiKey': '', |
227 | 228 |
'mch_cert': '', |
@@ -371,7 +372,7 @@ MANAGERS = ADMINS |
||
371 | 372 |
EMAIL_SUBJECT_PREFIX = u'[Kodo] ' |
372 | 373 |
|
373 | 374 |
# Django-Admin Settings |
374 |
-DISABLE_ACTION = False |
|
375 |
+DJANGO_ADMIN_DISABLE_DELETE_SELECTED = False |
|
375 | 376 |
|
376 | 377 |
# Django-Logit Settings |
377 | 378 |
DJANGO_LOGIT_ENABLED = True |
@@ -60,6 +60,7 @@ def get_userinfo_api(request): |
||
60 | 60 |
user.user_id = CurtailUUID.uuid(UserInfo, 'user_id') |
61 | 61 |
# 注册用户统计 |
62 | 62 |
rsi, _ = RegisterStatisticInfo.objects.select_for_update().get_or_create( |
63 |
+ brand_id=brand_id, |
|
63 | 64 |
ymd=int(tc.local_string(format='%Y%m%d')), |
64 | 65 |
) |
65 | 66 |
rsi.num += 1 |
@@ -4,7 +4,7 @@ Pillow==5.0.0 |
||
4 | 4 |
StatusCode==1.0.0 |
5 | 5 |
TimeConvert==1.4.3 |
6 | 6 |
cryptography==1.5.2 |
7 |
-furl==1.2 |
|
7 |
+furl==1.2.1 |
|
8 | 8 |
isoweek==1.3.3 |
9 | 9 |
jsonfield==2.0.2 |
10 | 10 |
mock==2.0.0 |