8
 from paginator import pagination
9 9
 from pywe_exception import WeChatPayException
10 10
 from pywe_pay import WeChatPay

+ 1 - 1
photo/models.py

@@ -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
 

+ 1 - 1
photo/views.py

@@ -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
 

+ 1 - 1
product/models.py

@@ -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
 

+ 7 - 8
requirements.txt

@@ -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 - 1
server/server_views.py

@@ -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
 

+ 0 - 1
utils/redis/rlock.py

@@ -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
 

+ 1 - 1
utils/storage_qiniu_utils.py

@@ -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

+ 1 - 1
utils/storage_utils.py

@@ -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

pai2 - Gogs: Go Git Service

拍爱

Brightcells: 102152ca4a add api lensman_photo_bought & modify api wx_order_create_api and adjust return field vor 9 Jahren
..
0001_initial.py e184e7dd5b add api group_create/group_join vor 10 Jahren
0002_groupinfo_session_id.py e184e7dd5b add api group_create/group_join vor 10 Jahren
0003_groupinfo_admin_id.py 7e305483ab add api group_detail/group_lock/group_pass/group_refuse vor 10 Jahren
0004_auto_20151216_2337.py 7467a3e68a add api group_update/group_remove vor 10 Jahren
0005_groupuserinfo_current_id.py f587f0a48f user can just see photo after he joined the group & zh_Hans replace zh_CN in settings.py vor 10 Jahren
0006_groupuserinfo_avatar.py 4afdb94e20 add avatar for GroupUserInfo vor 10 Jahren
0007_auto_20160112_2040.py df1df69fe3 add api upgrade/splash vor 10 Jahren
0008_photocommentinfo.py c72d89f6e5 add api comment_submit_api/comment_list_api/thumbup_submit_api/thumbup_list_api/thumbup_cancel_api vor 10 Jahren
0009_photothumbupinfo.py c72d89f6e5 add api comment_submit_api/comment_list_api/thumbup_submit_api/thumbup_list_api/thumbup_cancel_api vor 10 Jahren
0010_auto_20160120_1830.py a121b75ff2 add db_index=True for status field vor 10 Jahren
0011_auto_20160302_2048.py da2a81fff1 add api pai2_home vor 9 Jahren
0012_groupinfo_group_avatar.py da2a81fff1 add api pai2_home vor 9 Jahren
0013_groupinfo_group_default_avatar.py f6a88c632b add group_default_avatar field for GroupInfo vor 9 Jahren
0014_auto_20160308_2347.py ca727b0362 store/return w/h for photo vor 9 Jahren
0015_groupphotoinfo_avatar.py 88049b12db store/return more field for photo vor 9 Jahren
0016_auto_20160321_1535.py 537bd9bd41 add api group_quit_api vor 9 Jahren
0017_groupphotoinfo_photo_from.py dbea356558 add photo_from field for GroupPhotoInfo and return photo_from for some api vor 9 Jahren
0018_auto_20160417_2246.py d64b3c216b add and return photo_thumbnail2 relative vor 9 Jahren
0019_auto_20160422_1322.py 102152ca4a add api lensman_photo_bought & modify api wx_order_create_api and adjust return field vor 9 Jahren
0020_groupphotoinfo_session_id.py 102152ca4a add api lensman_photo_bought & modify api wx_order_create_api and adjust return field vor 9 Jahren
__init__.py e184e7dd5b add api group_create/group_join vor 10 Jahren