from paginator import pagination
from pywe_exception import WeChatPayException
from pywe_pay import WeChatPay
@@ -2,7 +2,7 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from django.db import models |
| 4 | 4 |
from django.utils.translation import ugettext_lazy as _ |
| 5 |
-from models_ext import BaseModelMixin |
|
| 5 |
+from django_models_ext import BaseModelMixin |
|
| 6 | 6 |
|
| 7 | 7 |
from utils.qiniucdn import qiniu_file_url |
| 8 | 8 |
|
@@ -3,9 +3,9 @@ |
||
| 3 | 3 |
from django.db import transaction |
| 4 | 4 |
from django.shortcuts import render |
| 5 | 5 |
from django_curtail_uuid import CurtailUUID |
| 6 |
+from django_logit import logit |
|
| 6 | 7 |
from django_response import response |
| 7 | 8 |
from ipaddr import client_ip |
| 8 |
-from logit import logit |
|
| 9 | 9 |
from rest_framework import viewsets |
| 10 | 10 |
from TimeConvert import TimeConvert as tc |
| 11 | 11 |
|
@@ -2,7 +2,7 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from django.db import models |
| 4 | 4 |
from django.utils.translation import ugettext_lazy as _ |
| 5 |
-from models_ext import BaseModelMixin, SexModelMixin |
|
| 5 |
+from django_models_ext import BaseModelMixin, SexModelMixin |
|
| 6 | 6 |
from shortuuidfield import ShortUUIDField |
| 7 | 7 |
|
| 8 | 8 |
|
@@ -5,26 +5,26 @@ Pillow==5.0.0 |
||
| 5 | 5 |
StatusCode==1.0.0 |
| 6 | 6 |
TimeConvert==1.4.3 |
| 7 | 7 |
cryptography==1.5.2 |
| 8 |
-django-admin==1.1.1 |
|
| 8 |
+django-admin==1.2.0 |
|
| 9 | 9 |
django-curtail-uuid==1.0.4 |
| 10 | 10 |
django-detect==1.0.5 |
| 11 |
-django-file-md5==1.0.1 |
|
| 11 |
+django-file-md5==1.0.2 |
|
| 12 | 12 |
django-file-upload==1.0.0 |
| 13 | 13 |
django-ip==1.0.2 |
| 14 | 14 |
django-json-render==1.0.0 |
| 15 | 15 |
django-json-response==1.1.5 |
| 16 |
-django-logit==1.0.8 |
|
| 16 |
+django-logit==1.1.2 |
|
| 17 | 17 |
django-mobi==0.1.7 |
| 18 |
-django-models-ext==1.1.0 |
|
| 18 |
+django-models-ext==1.1.1 |
|
| 19 | 19 |
django-multidomain==1.1.4 |
| 20 | 20 |
django-paginator2==1.0.3 |
| 21 | 21 |
django-redis-connector==1.0.1 |
| 22 |
-django-response==1.0.2 |
|
| 22 |
+django-response==1.1.1 |
|
| 23 | 23 |
django-rlog==1.0.7 |
| 24 | 24 |
django-shortuuidfield==0.1.3 |
| 25 | 25 |
django-six==1.0.4 |
| 26 | 26 |
django-uniapi==1.0.1 |
| 27 |
-django-we==1.1.6 |
|
| 27 |
+django-we==1.2.1 |
|
| 28 | 28 |
djangorestframework==3.7.7 |
| 29 | 29 |
furl==1.0.1 |
| 30 | 30 |
hiredis==0.2.0 |
@@ -37,7 +37,7 @@ pywe-membercard==1.0.0 |
||
| 37 | 37 |
pywe-miniapp==1.0.2 |
| 38 | 38 |
pywe-oauth==1.0.6 |
| 39 | 39 |
pywe-pay==1.0.11 |
| 40 |
-pywe-pay-notify==1.0.1 |
|
| 40 |
+pywe-pay-notify==1.0.4 |
|
| 41 | 41 |
pywe-response==1.0.1 |
| 42 | 42 |
pywe-sign==1.0.7 |
| 43 | 43 |
pywe-xml==1.0.0 |
@@ -48,5 +48,4 @@ requests==2.18.4 |
||
| 48 | 48 |
rlog==0.3 |
| 49 | 49 |
rsa==3.4.2 |
| 50 | 50 |
shortuuid==0.5.0 |
| 51 |
-uWSGI==2.0.15 |
|
| 52 | 51 |
versions==0.10.0 |
@@ -1,7 +1,7 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 |
+from django_logit import logit |
|
| 3 | 4 |
from django_response import response |
| 4 |
-from logit import logit |
|
| 5 | 5 |
from TimeConvert import TimeConvert as tc |
| 6 | 6 |
|
| 7 | 7 |
|
@@ -1,7 +1,6 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 | 3 |
from filemd5 import calculate_md5 |
| 4 |
- |
|
| 5 | 4 |
from utils.redis.connect import r |
| 6 | 5 |
|
| 7 | 6 |
|
@@ -6,8 +6,8 @@ import shortuuid |
||
| 6 | 6 |
from django.conf import settings |
| 7 | 7 |
from django.core.files.storage import default_storage |
| 8 | 8 |
from django.db import transaction |
| 9 |
-from filemd5 import calculate_md5 |
|
| 10 | 9 |
|
| 10 |
+from filemd5 import calculate_md5 |
|
| 11 | 11 |
from photo.models import PhotoUUIDInfo |
| 12 | 12 |
from utils.qiniucdn import upload_file_path |
| 13 | 13 |
from utils.thumbnail_utils import make_thumbnail |
@@ -6,8 +6,8 @@ import shortuuid |
||
| 6 | 6 |
from django.conf import settings |
| 7 | 7 |
from django.core.files.storage import default_storage |
| 8 | 8 |
from django.db import transaction |
| 9 |
-from filemd5 import calculate_md5 |
|
| 10 | 9 |
|
| 10 |
+from filemd5 import calculate_md5 |
|
| 11 | 11 |
from photo.models import PhotoUUIDInfo |
| 12 | 12 |
from utils.thumbnail_utils import make_thumbnail |
| 13 | 13 |
from utils.watermark_utils import watermark_wrap |