if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pai2.settings")
@@ -2,8 +2,7 @@ |
||
2 | 2 |
|
3 | 3 |
from django.contrib import admin |
4 | 4 |
|
5 |
-from message.models import (SystemMessageDeleteInfo, SystemMessageInfo, |
|
6 |
- SystemMessageReadInfo, UserMessageInfo) |
|
5 |
+from message.models import SystemMessageDeleteInfo, SystemMessageInfo, SystemMessageReadInfo, UserMessageInfo |
|
7 | 6 |
|
8 | 7 |
|
9 | 8 |
class UserMessageInfoAdmin(admin.ModelAdmin): |
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.test import TestCase |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Create your tests here. |
@@ -4,15 +4,11 @@ from django.conf import settings |
||
4 | 4 |
from django.http import JsonResponse |
5 | 5 |
|
6 | 6 |
from account.models import UserInfo |
7 |
-from message.models import (SystemMessageDeleteInfo, SystemMessageInfo, |
|
8 |
- SystemMessageReadInfo, UserMessageInfo) |
|
7 |
+from message.models import SystemMessageDeleteInfo, SystemMessageInfo, SystemMessageReadInfo, UserMessageInfo |
|
9 | 8 |
from utils.error.errno_utils import MessageStatusCode, UserStatusCode |
10 | 9 |
from utils.error.response_utils import response |
11 | 10 |
from utils.page_utils import pagination |
12 |
-from utils.redis.rmessage import (get_system_message_delete_info, |
|
13 |
- get_system_message_read_info, |
|
14 |
- set_system_message_delete_info, |
|
15 |
- set_system_message_read_info) |
|
11 |
+from utils.redis.rmessage import get_system_message_delete_info, get_system_message_read_info, set_system_message_delete_info, set_system_message_read_info |
|
16 | 12 |
|
17 | 13 |
|
18 | 14 |
def message_list_api(request): |
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.test import TestCase |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Create your tests here. |
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.contrib import admin |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Register your models here. |
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.db import models |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Create your models here. |
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.test import TestCase |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Create your tests here. |
@@ -15,6 +15,7 @@ https://docs.djangoproject.com/en/1.8/ref/settings/ |
||
15 | 15 |
# Build paths inside the project like this: os.path.join(BASE_DIR, ...) |
16 | 16 |
import os |
17 | 17 |
|
18 |
+ |
|
18 | 19 |
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) |
19 | 20 |
PROJ_DIR = os.path.abspath(os.path.dirname(os.path.abspath(__file__))) |
20 | 21 |
|
@@ -27,6 +27,7 @@ from page import views as page_views |
||
27 | 27 |
from photo import views as photo_views |
28 | 28 |
from website import views as website_views |
29 | 29 |
|
30 |
+ |
|
30 | 31 |
router = routers.DefaultRouter() |
31 | 32 |
# router.register(r'users', account_views.UserViewSet) |
32 | 33 |
# router.register(r'groups', account_views.GroupViewSet) |
@@ -3,6 +3,7 @@ |
||
3 | 3 |
from django.conf import settings |
4 | 4 |
from django.conf.urls import include, url |
5 | 5 |
|
6 |
+ |
|
6 | 7 |
urlpatterns = [ |
7 | 8 |
url(r'^', include('api.urls', namespace='api')), |
8 | 9 |
] |
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.shortcuts import render |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Create your views here. |
@@ -11,6 +11,7 @@ import os |
||
11 | 11 |
|
12 | 12 |
from django.core.wsgi import get_wsgi_application |
13 | 13 |
|
14 |
+ |
|
14 | 15 |
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pai2.settings") |
15 | 16 |
|
16 | 17 |
application = get_wsgi_application() |
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.test import TestCase |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Create your tests here. |
@@ -18,6 +18,7 @@ from utils.page_utils import pagination |
||
18 | 18 |
from utils.redis.rkeys import LENSMAN_PHOTO_PRICE |
19 | 19 |
from utils.redis.rorder import set_lensman_order_record |
20 | 20 |
|
21 |
+ |
|
21 | 22 |
r = settings.REDIS_CACHE |
22 | 23 |
WECHAT = settings.WECHAT |
23 | 24 |
|
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.test import TestCase |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Create your tests here. |
@@ -19,12 +19,12 @@ from photo.serializers import PhotosInfoSerializer |
||
19 | 19 |
from utils.error.errno_utils import PhotoStatusCode |
20 | 20 |
from utils.error.response_utils import response |
21 | 21 |
from utils.ip_utils import ip_addr |
22 |
-from utils.redis.rgroup import (get_group_info, get_group_users_info, |
|
23 |
- set_group_info, set_group_users_info) |
|
22 |
+from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_info, set_group_users_info |
|
24 | 23 |
from utils.redis.rkeys import GROUP_LAST_PHOTO_PK |
25 | 24 |
from utils.thumbnail_utils import make_thumbnail |
26 | 25 |
from utils.watermark_utils import watermark_wrap |
27 | 26 |
|
27 |
+ |
|
28 | 28 |
r = settings.REDIS_CACHE |
29 | 29 |
|
30 | 30 |
|
@@ -3,9 +3,8 @@ |
||
3 | 3 |
from django.conf import settings |
4 | 4 |
|
5 | 5 |
from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo |
6 |
-from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_APPLYING_SET, |
|
7 |
- GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET, |
|
8 |
- GROUP_USERS_REFUSED_SET) |
|
6 |
+from utils.redis.rkeys import GROUP_LAST_PHOTO_PK, GROUP_USERS_APPLYING_SET, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET, GROUP_USERS_REFUSED_SET |
|
7 |
+ |
|
9 | 8 |
|
10 | 9 |
r = settings.REDIS_CACHE |
11 | 10 |
|
@@ -5,8 +5,8 @@ import json |
||
5 | 5 |
from django.conf import settings |
6 | 6 |
from django.core.serializers.json import DjangoJSONEncoder |
7 | 7 |
|
8 |
-from utils.redis.rkeys import (GROUP_INFO, GROUP_PHOTO_THUMB_UP, |
|
9 |
- GROUP_USERS_INFO) |
|
8 |
+from utils.redis.rkeys import GROUP_INFO, GROUP_PHOTO_THUMB_UP, GROUP_USERS_INFO |
|
9 |
+ |
|
10 | 10 |
|
11 | 11 |
r = settings.REDIS_CACHE |
12 | 12 |
|
@@ -5,8 +5,8 @@ import json |
||
5 | 5 |
from django.conf import settings |
6 | 6 |
|
7 | 7 |
from message.models import SystemMessageDeleteInfo, SystemMessageReadInfo |
8 |
-from utils.redis.rkeys import (SYSTEM_MESSAGE_DELETED_INFO, |
|
9 |
- SYSTEM_MESSAGE_READ_INFO) |
|
8 |
+from utils.redis.rkeys import SYSTEM_MESSAGE_DELETED_INFO, SYSTEM_MESSAGE_READ_INFO |
|
9 |
+ |
|
10 | 10 |
|
11 | 11 |
r = settings.REDIS_CACHE |
12 | 12 |
|
@@ -7,6 +7,7 @@ from django.core.serializers.json import DjangoJSONEncoder |
||
7 | 7 |
|
8 | 8 |
from utils.redis.rkeys import LENSMAN_PHOTO_ORDER_RECORD |
9 | 9 |
|
10 |
+ |
|
10 | 11 |
r = settings.REDIS_CACHE |
11 | 12 |
|
12 | 13 |
|
@@ -2,6 +2,7 @@ |
||
2 | 2 |
|
3 | 3 |
from __future__ import division |
4 | 4 |
|
5 |
+ |
|
5 | 6 |
try: |
6 | 7 |
from PIL import Image |
7 | 8 |
except ImportError: |
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.contrib import admin |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Register your models here. |
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.db import models |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Create your models here. |
@@ -1,3 +1,4 @@ |
||
1 | 1 |
from django.test import TestCase |
2 | 2 |
|
3 |
+ |
|
3 | 4 |
# Create your tests here. |