Change to use django-response
Brightcells
18 changed files with 18 additions and 36 deletions
+ 1
- 1
account/tourguide_views.py
@@ -4,11 +4,11 @@ from __future__ import division |
||
| 4 | 4 |
|
| 5 | 5 |
from django.conf import settings |
| 6 | 6 |
from django.db import transaction |
| 7 |
+from django_response import response |
|
| 7 | 8 |
from logit import logit |
| 8 | 9 |
|
| 9 | 10 |
from account.models import TourGuideInfo, UserInfo |
| 10 | 11 |
from utils.error.errno_utils import TourGuideStatusCode |
| 11 |
-from utils.error.response_utils import response |
|
| 12 | 12 |
from utils.redis.rprofile import set_profile_info |
| 13 | 13 |
|
| 14 | 14 |
|
+ 1
- 1
account/views.py
@@ -3,6 +3,7 @@ |
||
| 3 | 3 |
from curtail_uuid import CurtailUUID |
| 4 | 4 |
from django.contrib.auth.models import Group, User |
| 5 | 5 |
from django.db import transaction |
| 6 |
+from django_response import response |
|
| 6 | 7 |
from ipaddr import client_ip |
| 7 | 8 |
from logit import logit |
| 8 | 9 |
from rest_framework import viewsets |
@@ -12,7 +13,6 @@ from account.models import LensmanInfo, UserInfo |
||
| 12 | 13 |
from account.serializers import GroupSerializer, LensmanInfoSerializer, UserInfoSerializer, UserSerializer |
| 13 | 14 |
from operation.models import GuestEntranceControlInfo |
| 14 | 15 |
from utils.error.errno_utils import UserStatusCode |
| 15 |
-from utils.error.response_utils import response |
|
| 16 | 16 |
from utils.redis.rguest import get_guest_entrance_control |
| 17 | 17 |
from utils.redis.rprofile import set_profile_info |
| 18 | 18 |
from utils.version_utils import is_version_match |
+ 2
- 1
api/mch_views.py
@@ -2,8 +2,9 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from __future__ import division |
| 4 | 4 |
|
| 5 |
+from django_response import response |
|
| 6 |
+ |
|
| 5 | 7 |
from mch.models import BrandInfo, DistributorInfo, ModelInfo |
| 6 |
-from utils.error.response_utils import response |
|
| 7 | 8 |
|
| 8 | 9 |
|
| 9 | 10 |
def brands_list(request): |
+ 1
- 1
box/views.py
@@ -1,10 +1,10 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 |
+from django_response import response |
|
| 3 | 4 |
from logit import logit |
| 4 | 5 |
|
| 5 | 6 |
from account.models import UserInfo |
| 6 | 7 |
from utils.error.errno_utils import LensmanStatusCode, TokenStatusCode |
| 7 |
-from utils.error.response_utils import response |
|
| 8 | 8 |
from utils.redis.connect import r |
| 9 | 9 |
|
| 10 | 10 |
|
+ 1
- 1
geo/views.py
@@ -5,11 +5,11 @@ from __future__ import division |
||
| 5 | 5 |
import json |
| 6 | 6 |
|
| 7 | 7 |
from django.core.serializers.json import DjangoJSONEncoder |
| 8 |
+from django_response import response |
|
| 8 | 9 |
from logit import logit |
| 9 | 10 |
from TimeConvert import TimeConvert as tc |
| 10 | 11 |
|
| 11 | 12 |
from utils.error.errno_utils import GroupUserStatusCode |
| 12 |
-from utils.error.response_utils import response |
|
| 13 | 13 |
from utils.redis.connect import r |
| 14 | 14 |
from utils.redis.rkeys import (TOUR_GUIDE_GROUP_CUR_SESSION, TOUR_GUIDE_GROUP_GEO_INFO, TOUR_GUIDE_GROUP_GEO_SUBMIT_DT, |
| 15 | 15 |
TOUR_GUIDE_GROUP_USER_GEO_LIST) |
+ 1
- 1
group/groupuser_views.py
@@ -2,13 +2,13 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from __future__ import division |
| 4 | 4 |
|
| 5 |
+from django_response import response |
|
| 5 | 6 |
from logit import logit |
| 6 | 7 |
from TimeConvert import TimeConvert as tc |
| 7 | 8 |
|
| 8 | 9 |
from account.models import UserInfo |
| 9 | 10 |
from group.models import GroupInfo, GroupUserInfo |
| 10 | 11 |
from utils.error.errno_utils import GroupStatusCode, GroupUserStatusCode, UserStatusCode |
| 11 |
-from utils.error.response_utils import response |
|
| 12 | 12 |
from utils.group_photo_utils import get_current_photos |
| 13 | 13 |
from utils.redis.connect import r |
| 14 | 14 |
from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_users_info |
+ 1
- 1
group/lensman_views.py
@@ -4,6 +4,7 @@ from __future__ import division |
||
| 4 | 4 |
|
| 5 | 5 |
from curtail_uuid import CurtailUUID |
| 6 | 6 |
from django.db import transaction |
| 7 |
+from django_response import response |
|
| 7 | 8 |
from ipaddr import client_ip |
| 8 | 9 |
from isoweek import Week |
| 9 | 10 |
from logit import logit |
@@ -16,7 +17,6 @@ from message.models import SystemMessageInfo |
||
| 16 | 17 |
from pay.models import OrderInfo |
| 17 | 18 |
from photo.models import PhotosInfo |
| 18 | 19 |
from utils.error.errno_utils import LensmanStatusCode, OrderStatusCode, UserStatusCode |
| 19 |
-from utils.error.response_utils import response |
|
| 20 | 20 |
from utils.message_utils import system_messages |
| 21 | 21 |
from utils.redis.connect import r |
| 22 | 22 |
from utils.redis.rbrief import set_brief_info |
+ 1
- 1
group/tourguidegroup_views.py
@@ -8,6 +8,7 @@ import shortuuid |
||
| 8 | 8 |
from curtail_uuid import CurtailUUID |
| 9 | 9 |
from django.conf import settings |
| 10 | 10 |
from django.core.serializers.json import DjangoJSONEncoder |
| 11 |
+from django_response import response |
|
| 11 | 12 |
from logit import logit |
| 12 | 13 |
from TimeConvert import TimeConvert as tc |
| 13 | 14 |
|
@@ -15,7 +16,6 @@ from account.models import UserInfo |
||
| 15 | 16 |
from group.models import GroupInfo, GroupUserInfo |
| 16 | 17 |
from utils.admin_utils import have_active_group, is_group_admin, is_group_subadmin |
| 17 | 18 |
from utils.error.errno_utils import GroupStatusCode, GroupUserStatusCode, TokenStatusCode, UserStatusCode |
| 18 |
-from utils.error.response_utils import response |
|
| 19 | 19 |
from utils.redis.connect import r |
| 20 | 20 |
from utils.redis.rgroup import get_group_info, get_group_users_info, set_group_info, set_group_users_info |
| 21 | 21 |
from utils.redis.rkeys import TOUR_GUIDE_GROUP_CUR_GATHER_INFO, TOUR_GUIDE_GROUP_CUR_SESSION |
+ 1
- 1
group/tourguidegroupadmin_views.py
@@ -2,12 +2,12 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from __future__ import division |
| 4 | 4 |
|
| 5 |
+from django_response import response |
|
| 5 | 6 |
from logit import logit |
| 6 | 7 |
|
| 7 | 8 |
from group.models import GroupUserInfo |
| 8 | 9 |
from utils.admin_utils import is_group_admin |
| 9 | 10 |
from utils.error.errno_utils import GroupStatusCode |
| 10 |
-from utils.error.response_utils import response |
|
| 11 | 11 |
|
| 12 | 12 |
|
| 13 | 13 |
@logit |
+ 1
- 1
group/tourguidegroupuser_views.py
@@ -6,6 +6,7 @@ import json |
||
| 6 | 6 |
|
| 7 | 7 |
from django.conf import settings |
| 8 | 8 |
from django.db import transaction |
| 9 |
+from django_response import response |
|
| 9 | 10 |
from logit import logit |
| 10 | 11 |
from TimeConvert import TimeConvert as tc |
| 11 | 12 |
|
@@ -13,7 +14,6 @@ from account.models import UserInfo |
||
| 13 | 14 |
from group.models import GroupInfo, GroupUserInfo |
| 14 | 15 |
from utils.admin_utils import is_group_subadmin |
| 15 | 16 |
from utils.error.errno_utils import GroupStatusCode, GroupUserStatusCode, UserStatusCode |
| 16 |
-from utils.error.response_utils import response |
|
| 17 | 17 |
from utils.group_photo_utils import get_current_photos |
| 18 | 18 |
from utils.redis.connect import r |
| 19 | 19 |
from utils.redis.rgroup import get_group_info, get_group_users_info, get_group_users_kv_info, set_group_users_info |
+ 1
- 1
group/views.py
@@ -5,6 +5,7 @@ from __future__ import division |
||
| 5 | 5 |
from curtail_uuid import CurtailUUID |
| 6 | 6 |
from django.conf import settings |
| 7 | 7 |
from django.db import connection, transaction |
| 8 |
+from django_response import response |
|
| 8 | 9 |
from logit import logit |
| 9 | 10 |
from paginator import pagination |
| 10 | 11 |
from rest_framework import viewsets |
@@ -15,7 +16,6 @@ from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo, PhotoCommentI |
||
| 15 | 16 |
from group.serializers import GroupInfoSerializer, GroupPhotoInfoSerializer, GroupUserInfoSerializer |
| 16 | 17 |
from message.models import UserMessageInfo |
| 17 | 18 |
from utils.error.errno_utils import GroupPhotoStatusCode, GroupStatusCode, GroupUserStatusCode, UserStatusCode |
| 18 |
-from utils.error.response_utils import response |
|
| 19 | 19 |
from utils.group_photo_utils import get_current_photos |
| 20 | 20 |
from utils.price_utils import get_group_photo_price |
| 21 | 21 |
from utils.qiniucdn import qiniu_file_url |
+ 1
- 1
message/views.py
@@ -1,13 +1,13 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 | 3 |
from django.conf import settings |
| 4 |
+from django_response import response |
|
| 4 | 5 |
from logit import logit |
| 5 | 6 |
from paginator import pagination |
| 6 | 7 |
|
| 7 | 8 |
from account.models import UserInfo |
| 8 | 9 |
from message.models import SystemMessageDeleteInfo, SystemMessageInfo, SystemMessageReadInfo, UserMessageInfo |
| 9 | 10 |
from utils.error.errno_utils import MessageStatusCode, UserStatusCode |
| 10 |
-from utils.error.response_utils import response |
|
| 11 | 11 |
from utils.message_utils import system_messages, system_unread_messages |
| 12 | 12 |
from utils.redis.rmessage import set_system_message_delete_info, set_system_message_read_info |
| 13 | 13 |
|
+ 1
- 1
miniapp/views.py
@@ -3,13 +3,13 @@ |
||
| 3 | 3 |
from curtail_uuid import CurtailUUID |
| 4 | 4 |
from django.conf import settings |
| 5 | 5 |
from django.db import transaction |
| 6 |
+from django_response import response |
|
| 6 | 7 |
from ipaddr import client_ip |
| 7 | 8 |
from logit import logit |
| 8 | 9 |
from pywe_miniapp import get_userinfo |
| 9 | 10 |
from TimeConvert import TimeConvert as tc |
| 10 | 11 |
|
| 11 | 12 |
from account.models import UserInfo |
| 12 |
-from utils.error.response_utils import response |
|
| 13 | 13 |
from utils.redis.rprofile import set_profile_info |
| 14 | 14 |
|
| 15 | 15 |
|
+ 1
- 1
operation/views.py
@@ -4,12 +4,12 @@ import os |
||
| 4 | 4 |
|
| 5 | 5 |
from django.conf import settings |
| 6 | 6 |
from django.shortcuts import redirect |
| 7 |
+from django_response import response |
|
| 7 | 8 |
from logit import logit |
| 8 | 9 |
|
| 9 | 10 |
from account.models import UserInfo |
| 10 | 11 |
from operation.models import FeedbackInfo, GuestEntranceControlInfo, LatestAppInfo, SplashInfo |
| 11 | 12 |
from utils.error.errno_utils import UserStatusCode |
| 12 |
-from utils.error.response_utils import response |
|
| 13 | 13 |
from utils.redis.rapp import get_latest_app |
| 14 | 14 |
from utils.redis.rguest import get_guest_entrance_control |
| 15 | 15 |
from utils.redis.roperation.rbox_program_version import get_box_program_version |
+ 1
- 1
pay/views.py
@@ -3,6 +3,7 @@ |
||
| 3 | 3 |
from django.conf import settings |
| 4 | 4 |
from django.db import transaction |
| 5 | 5 |
from django.shortcuts import HttpResponse |
| 6 |
+from django_response import response |
|
| 6 | 7 |
from logit import logit |
| 7 | 8 |
from paginator import pagination |
| 8 | 9 |
from pywe_exception import WeChatPayException |
@@ -18,7 +19,6 @@ from pay.models import OrderInfo |
||
| 18 | 19 |
from photo.models import PhotosInfo |
| 19 | 20 |
from utils.error.errno_utils import (GroupPhotoStatusCode, OrderStatusCode, UserStatusCode, WechatStatusCode, |
| 20 | 21 |
WithdrawStatusCode) |
| 21 |
-from utils.error.response_utils import response |
|
| 22 | 22 |
from utils.price_utils import get_group_photo_price |
| 23 | 23 |
from utils.redis.rbrief import set_brief_info |
| 24 | 24 |
from utils.redis.rorder import set_lensman_order_record |
+ 1
- 1
photo/views.py
@@ -4,6 +4,7 @@ from curtail_uuid import CurtailUUID |
||
| 4 | 4 |
from django.db import transaction |
| 5 | 5 |
from django.shortcuts import render |
| 6 | 6 |
from django_q.tasks import async |
| 7 |
+from django_response import response |
|
| 7 | 8 |
from ipaddr import client_ip |
| 8 | 9 |
from logit import logit |
| 9 | 10 |
from rest_framework import viewsets |
@@ -14,7 +15,6 @@ from group.models import GroupInfo, GroupPhotoInfo, GroupUserInfo |
||
| 14 | 15 |
from photo.models import PhotosInfo |
| 15 | 16 |
from photo.serializers import PhotosInfoSerializer |
| 16 | 17 |
from utils.error.errno_utils import LensmanStatusCode, PhotoStatusCode |
| 17 |
-from utils.error.response_utils import response |
|
| 18 | 18 |
from utils.redis.connect import r |
| 19 | 19 |
from utils.redis.rgroup import get_group_info, set_group_info, set_group_users_info |
| 20 | 20 |
from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET, |
+ 1
- 2
server/server_views.py
@@ -1,10 +1,9 @@ |
||
| 1 | 1 |
# -*- coding: utf-8 -*- |
| 2 | 2 |
|
| 3 |
+from django_response import response |
|
| 3 | 4 |
from logit import logit |
| 4 | 5 |
from TimeConvert import TimeConvert as tc |
| 5 | 6 |
|
| 6 |
-from utils.error.response_utils import response |
|
| 7 |
- |
|
| 8 | 7 |
|
| 9 | 8 |
@logit |
| 10 | 9 |
def get_server_time_api(request): |
+ 0
- 18
utils/error/response_utils.py
@@ -1,18 +0,0 @@ |
||
| 1 |
-# -*- coding: utf-8 -*- |
|
| 2 |
- |
|
| 3 |
-from django.http import JsonResponse |
|
| 4 |
-from StatusCode import StatusCodeField |
|
| 5 |
- |
|
| 6 |
- |
|
| 7 |
-def response_data(status_code=200, message=None, description=None, data={}, **kwargs):
|
|
| 8 |
- return dict({
|
|
| 9 |
- 'status': status_code, |
|
| 10 |
- 'message': message, |
|
| 11 |
- 'description': description, |
|
| 12 |
- 'data': data, |
|
| 13 |
- }, **kwargs) |
|
| 14 |
- |
|
| 15 |
- |
|
| 16 |
-def response(status_code=200, message=None, description=None, data={}, **kwargs):
|
|
| 17 |
- message, description = (message or status_code.message, description or status_code.description) if isinstance(status_code, StatusCodeField) else (message, description) |
|
| 18 |
- return JsonResponse(response_data(status_code, message, description, data, **kwargs), safe=False) |