@@ -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 |
|
@@ -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 |
|
@@ -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 |
@@ -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 |
@@ -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,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): |
@@ -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) |