From 89a0c66455945914a2e819d6be540b98429de32a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Wed, 12 May 2021 19:57:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96(=E6=A1=86?=
 =?UTF-8?q?=E6=9E=B6-=E5=88=86=E9=A1=B5=E5=99=A8):=20=E5=8F=AF=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E8=87=AA=E5=AE=9A=E4=B9=89=E9=85=8D=E7=BD=AE=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dvadmin-backend/application/settings.py        | 2 +-
 dvadmin-backend/apps/vadmin/op_drf/generics.py | 2 +-
 dvadmin-backend/apps/vadmin/op_drf/viewsets.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dvadmin-backend/application/settings.py b/dvadmin-backend/application/settings.py
index 7e19586..75411de 100644
--- a/dvadmin-backend/application/settings.py
+++ b/dvadmin-backend/application/settings.py
@@ -283,7 +283,7 @@ REST_FRAMEWORK = {
     ),
 
     'DEFAULT_SCHEMA_CLASS': 'rest_framework.schemas.AutoSchema',
-    'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.PageNumberPagination',
+    'DEFAULT_PAGINATION_CLASS': 'vadmin.op_drf.pagination.JsonPagination',
     'DEFAULT_FILTER_BACKENDS': ('django_filters.rest_framework.DjangoFilterBackend',),
     'EXCEPTION_HANDLER': 'apps.vadmin.utils.exceptions.op_exception_handler',
 }
diff --git a/dvadmin-backend/apps/vadmin/op_drf/generics.py b/dvadmin-backend/apps/vadmin/op_drf/generics.py
index f508c38..802c111 100644
--- a/dvadmin-backend/apps/vadmin/op_drf/generics.py
+++ b/dvadmin-backend/apps/vadmin/op_drf/generics.py
@@ -45,7 +45,7 @@ class GenericAPIView(CustomAPIView):
     filter_backends = api_settings.DEFAULT_FILTER_BACKENDS
 
     # The style to use for queryset pagination.
-    pagination_class = Pagination
+    pagination_class = api_settings.DEFAULT_PAGINATION_CLASS
 
     def get_queryset(self):
         """
diff --git a/dvadmin-backend/apps/vadmin/op_drf/viewsets.py b/dvadmin-backend/apps/vadmin/op_drf/viewsets.py
index d707526..5119aa0 100644
--- a/dvadmin-backend/apps/vadmin/op_drf/viewsets.py
+++ b/dvadmin-backend/apps/vadmin/op_drf/viewsets.py
@@ -29,7 +29,7 @@ def get_object_or_404(queryset, *filter_args, **filter_kwargs):
 
 class GenericViewSet(ViewSetMixin, GenericAPIView):
     extra_filter_backends = []
-    pagination_class = Pagination
+    pagination_class = api_settings.DEFAULT_PAGINATION_CLASS
     filter_backends = [DjangoFilterBackend, OrderingFilter, SearchFilter, AdvancedSearchFilter]
     view_logger_classes = (CustomerModelViewLogger,)