diff --git a/apps/jumpserver/settings/libs.py b/apps/jumpserver/settings/libs.py index 706fb3647..eb07e299d 100644 --- a/apps/jumpserver/settings/libs.py +++ b/apps/jumpserver/settings/libs.py @@ -40,7 +40,9 @@ REST_FRAMEWORK = { 'DATETIME_FORMAT': '%Y-%m-%d %H:%M:%S %z', 'DATETIME_INPUT_FORMATS': ['iso-8601', '%Y-%m-%d %H:%M:%S %z'], 'DEFAULT_PAGINATION_CLASS': 'rest_framework.pagination.LimitOffsetPagination', - # 'PAGE_SIZE': 15 + # 'PAGE_SIZE': 100, + # 'MAX_PAGE_SIZE': 5000 + } SWAGGER_SETTINGS = { diff --git a/apps/settings/api.py b/apps/settings/api.py index 6e7fd7248..759c7f70c 100644 --- a/apps/settings/api.py +++ b/apps/settings/api.py @@ -271,7 +271,8 @@ class PublicSettingApi(generics.RetrieveAPIView): "WINDOWS_SKIP_ALL_MANUAL_PASSWORD": settings.WINDOWS_SKIP_ALL_MANUAL_PASSWORD, "SECURITY_MAX_IDLE_TIME": settings.SECURITY_MAX_IDLE_TIME, "XPACK_ENABLED": settings.XPACK_ENABLED, - "XPACK_LICENSE_IS_VALID": settings.XPACK_LICENSE_IS_VALID + "XPACK_LICENSE_IS_VALID": settings.XPACK_LICENSE_IS_VALID, + "LOGIN_CONFIRM_ENABLE": settings.LOGIN_CONFIRM_ENABLE } } return instance