account/views.py

@@ -4,6 +4,7 @@ from curtail_uuid import CurtailUUID

                 from django.contrib.auth.hashers import check_password, make_password
              

                 from django.contrib.auth.models import Group, User
              

                 from django.db import transaction
              

                +from ipaddr import client_ip
              

                 from logit import logit
              

                 from rest_framework import viewsets
              

                 from TimeConvert import TimeConvert as tc
              
@@ -13,7 +14,6 @@ from account.serializers import GroupSerializer, LensmanInfoSerializer, UserInfo

                 from operation.models import GuestEntranceControlInfo
              

                 from utils.error.errno_utils import LensmanStatusCode, UserStatusCode
              

                 from utils.error.response_utils import response
              

                -from utils.ip_utils import get_client_ip
              

                 from utils.redis.rguest import get_guest_entrance_control
              

                 from utils.redis.rprofile import set_profile_info
              

                 from utils.version_utils import is_version_match
              
@@ -56,7 +56,7 @@ def user_signup_api(request):

                         return response(UserStatusCode.USERNAME_HAS_REGISTERED)
              

                 
              

                     # 判断 user_id 是否存在并且为分配用户，如果存在并且为分配用户，则直接在该帐户上更新，否则则直接创建帐户
              

                -    signup_ip, signup_at = get_client_ip(request), tc.utc_datetime()
              

                +    signup_ip, signup_at = client_ip(request), tc.utc_datetime()
              

                 
              

                     try:
              

                         user = UserInfo.objects.select_for_update().get(user_id=user_id)
              
@@ -96,7 +96,7 @@ def user_login_api(request):

                     except UserInfo.DoesNotExist:
              

                         return response(UserStatusCode.USER_NOT_FOUND)
              

                 
              

                -    login_ip, login_at = get_client_ip(request), tc.utc_datetime()
              

                +    login_ip, login_at = client_ip(request), tc.utc_datetime()
              

                 
              

                     if not check_password(password, user.password):
              

                         UserLoginLogInfo.objects.create(
              
@@ -156,7 +156,7 @@ def user_wx_authorize_api(request):

                     # unionid 不存在
              

                     # 判断 user_id 是否存在并且为分配用户，如果存在并且为分配用户，则直接在该帐户上更新，否则则直接创建帐户
              

                 
              

                -    signup_ip, signup_at = get_client_ip(request), tc.utc_datetime()
              

                +    signup_ip, signup_at = client_ip(request), tc.utc_datetime()
              

                 
              

                     try:
              

                         user = UserInfo.objects.select_for_update().get(user_id=user_id)
              

photo/views.py

@@ -8,6 +8,7 @@ from django.conf import settings

                 from django.db import transaction
              

                 from django.shortcuts import render
              

                 from django_q.tasks import async
              

                +from ipaddr import client_ip
              

                 from logit import logit
              

                 from rest_framework import viewsets
              

                 from TimeConvert import TimeConvert as tc
              
@@ -18,7 +19,6 @@ from photo.models import PhotosInfo

                 from photo.serializers import PhotosInfoSerializer
              

                 from utils.error.errno_utils import LensmanStatusCode, PhotoStatusCode
              

                 from utils.error.response_utils import response
              

                -from utils.ip_utils import get_client_ip
              

                 from utils.redis.connect import r
              

                 from utils.redis.rgroup import get_group_info, set_group_info, set_group_users_info
              

                 from utils.redis.rkeys import (GROUP_LAST_PHOTO_PK, GROUP_USERS_DELETED_SET, GROUP_USERS_PASSED_SET,
              
@@ -123,7 +123,7 @@ def session_join_api(request):

                     user, user_created = UserInfo.objects.get_or_create(user_id=user_id, defaults={
              

                         'user_id': CurtailUUID.uuid(UserInfo, 'user_id'),
              

                         'user_status': UserInfo.ASSIGN,
              

                -        'assign_ip': get_client_ip(request),
              

                +        'assign_ip': client_ip(request),
              

                         'assign_at': tc.utc_datetime(),
              

                     })
              

                     user_id = user.user_id
              

requirements.txt

@@ -9,6 +9,7 @@ TimeConvert==1.3.12

                 cryptography==1.5.2
              

                 django-curtail-uuid==1.0.0
              

                 django-detect==1.0.5
              

                +django-ip==1.0.0
              

                 django-json-response==1.1.4
              

                 django-logit==1.0.6
              

                 django-multidomain==1.1.4
              

utils/ip_utils.py

@@ -1,10 +0,0 @@

                -# -*- coding: utf-8 -*-
              

                -
              

                -
              

                -def get_client_ip(request):
              

                -    x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR')
              

                -    if x_forwarded_for:
              

                -        ip = x_forwarded_for.split(',')[0]
              

                -    else:
              

                -        ip = request.META.get('REMOTE_ADDR')
              

                -    return ip