move errno_utils.py／response_utils.py into error file
Brightcells
8 changed files with 17 additions and 12 deletions
+ 3
- 2
account/views.py
@@ -9,9 +9,10 @@ from rest_framework import viewsets |
||
| 9 | 9 |
from account.models import LensmanInfo, UserInfo, UserLoginLogInfo |
| 10 | 10 |
from account.serializers import UserSerializer, GroupSerializer, LensmanInfoSerializer, UserInfoSerializer |
| 11 | 11 |
|
| 12 |
-from utils.errno_utils import UserStatusCode |
|
| 13 | 12 |
from utils.ip_utils import ip_addr |
| 14 |
-from utils.response_utils import response |
|
| 13 |
+ |
|
| 14 |
+from utils.error.errno_utils import UserStatusCode |
|
| 15 |
+from utils.error.response_utils import response |
|
| 15 | 16 |
|
| 16 | 17 |
from curtail_uuid import CurtailUUID |
| 17 | 18 |
from TimeConvert import TimeConvert as tc |
+ 3
- 2
group/views.py
@@ -13,10 +13,11 @@ from message.models import UserMessageInfo |
||
| 13 | 13 |
|
| 14 | 14 |
from group.serializers import GroupInfoSerializer, GroupUserInfoSerializer, GroupPhotoInfoSerializer |
| 15 | 15 |
|
| 16 |
-from utils.errno_utils import UserStatusCode, GroupStatusCode, GroupPhotoStatusCode |
|
| 17 |
-from utils.response_utils import response |
|
| 18 | 16 |
from utils.thumbnail_utils import make_thumb |
| 19 | 17 |
|
| 18 |
+from utils.error.errno_utils import UserStatusCode, GroupStatusCode, GroupPhotoStatusCode |
|
| 19 |
+from utils.error.response_utils import response |
|
| 20 |
+ |
|
| 20 | 21 |
from curtail_uuid import CurtailUUID |
| 21 | 22 |
|
| 22 | 23 |
from TimeConvert import TimeConvert as tc |
+ 3
- 2
message/views.py
@@ -5,10 +5,11 @@ from django.http import JsonResponse |
||
| 5 | 5 |
|
| 6 | 6 |
from message.models import UserMessageInfo |
| 7 | 7 |
|
| 8 |
-from utils.errno_utils import MessageStatusCode |
|
| 9 |
-from utils.response_utils import response |
|
| 10 | 8 |
from utils.page_utils import pagination |
| 11 | 9 |
|
| 10 |
+from utils.error.errno_utils import MessageStatusCode |
|
| 11 |
+from utils.error.response_utils import response |
|
| 12 |
+ |
|
| 12 | 13 |
|
| 13 | 14 |
def message_list_api(request): |
| 14 | 15 |
user_id = request.POST.get('user_id', '') or request.GET.get('user_id', '')
|
+ 2
- 2
pay/views.py
@@ -7,8 +7,8 @@ from django.shortcuts import HttpResponse |
||
| 7 | 7 |
|
| 8 | 8 |
from pay.models import OrderInfo |
| 9 | 9 |
|
| 10 |
-from utils.errno_utils import OrderStatusCode |
|
| 11 |
-from utils.response_utils import response |
|
| 10 |
+from utils.error.errno_utils import OrderStatusCode |
|
| 11 |
+from utils.error.response_utils import response |
|
| 12 | 12 |
|
| 13 | 13 |
from TimeConvert import TimeConvert as tc |
| 14 | 14 |
from wechatpy import WeChatPay, WeChatPayException |
+ 3
- 2
photo/views.py
@@ -13,11 +13,12 @@ from group.models import GroupInfo, GroupUserInfo, GroupPhotoInfo |
||
| 13 | 13 |
from photo.models import UUIDInfo, PhotosInfo |
| 14 | 14 |
from photo.serializers import PhotosInfoSerializer |
| 15 | 15 |
|
| 16 |
-from utils.errno_utils import PhotoStatusCode |
|
| 17 | 16 |
from utils.ip_utils import ip_addr |
| 18 |
-from utils.response_utils import response |
|
| 19 | 17 |
from utils.watermark_utils import watermark_wrap |
| 20 | 18 |
|
| 19 |
+from utils.error.errno_utils import PhotoStatusCode |
|
| 20 |
+from utils.error.response_utils import response |
|
| 21 |
+ |
|
| 21 | 22 |
from curtail_uuid import CurtailUUID |
| 22 | 23 |
|
| 23 | 24 |
from TimeConvert import TimeConvert as tc |
+ 0
- 0
utils/error/__init__.py
utils/errno_utils.py → utils/error/errno_utils.py
+ 3
- 2
utils/response_utils.py
@@ -3,8 +3,9 @@ |
||
| 3 | 3 |
from django.http import JsonResponse |
| 4 | 4 |
|
| 5 | 5 |
|
| 6 |
-def response(status_code): |
|
| 6 |
+def response(status_code, data={}):
|
|
| 7 | 7 |
return JsonResponse({
|
| 8 | 8 |
'status': status_code, |
| 9 |
- 'message': status_code.description |
|
| 9 |
+ 'message': status_code.description, |
|
| 10 |
+ 'data': data, |
|
| 10 | 11 |
}) |