From ffd98c6e3f409fd48ac7efc563356c8fc9481426 Mon Sep 17 00:00:00 2001 From: ibuler Date: Tue, 12 Apr 2022 15:11:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/authentication/utils.py | 3 +-- apps/terminal/api/terminal.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/authentication/utils.py b/apps/authentication/utils.py index 6dc3866fe..cf4ce8185 100644 --- a/apps/authentication/utils.py +++ b/apps/authentication/utils.py @@ -9,8 +9,7 @@ from django.conf import settings from .notifications import DifferentCityLoginMessage from audits.models import UserLoginLog from audits.const import DEFAULT_CITY -from common.utils import get_request_ip -from common.utils import validate_ip, get_ip_city +from common.utils import validate_ip, get_ip_city, get_request_ip from common.utils import get_logger logger = get_logger(__file__) diff --git a/apps/terminal/api/terminal.py b/apps/terminal/api/terminal.py index f3fa8f5d0..209492baa 100644 --- a/apps/terminal/api/terminal.py +++ b/apps/terminal/api/terminal.py @@ -12,7 +12,7 @@ from django.utils.translation import gettext_lazy as _ from common.exceptions import JMSException from common.drf.api import JMSBulkModelViewSet -from common.utils import get_object_or_none +from common.utils import get_object_or_none, get_request_ip from common.permissions import WithBootstrapToken from ..models import Terminal from .. import serializers