|
@@ -32,7 +32,7 @@ from ratelimit.decorators import ratelimit
|
|
|
from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN, APNS_CONFIG, JPUSH_CONFIG, FCM_CONFIG, TUTK_PUSH_DOMAIN
|
|
|
from Controller.CheckUserData import DataValid, date_handler, RandomStr
|
|
|
from Model.models import Device_User, Role, UidPushModel, UserOauth2Model, UserExModel, Device_Info, UidSetModel, \
|
|
|
- UserAppFrequencyModel
|
|
|
+ UserAppFrequencyModel, CountryIPModel
|
|
|
from Object.AWS.SesClassObject import SesClassObject
|
|
|
from Object.AliSmsObject import AliSmsObject
|
|
|
from Object.RedisObject import RedisObject
|
|
@@ -1863,13 +1863,11 @@ class InitInfoView(View):
|
|
|
update(**update_dict)
|
|
|
if appBundleId:
|
|
|
user_ex_qs = UserExModel.objects.filter(userID_id=userID)
|
|
|
- country = CommonService.getAddr(CommonService.get_ip_address(request))
|
|
|
if user_ex_qs.exists():
|
|
|
update_dict = {
|
|
|
'updTime': now_time,
|
|
|
'appBundleId': appBundleId,
|
|
|
- 'region': lang,
|
|
|
- 'country': country
|
|
|
+ 'region': lang
|
|
|
}
|
|
|
user_ex_qs.update(**update_dict)
|
|
|
else:
|
|
@@ -1878,10 +1876,19 @@ class InitInfoView(View):
|
|
|
'updTime': now_time,
|
|
|
'appBundleId': appBundleId,
|
|
|
'userID_id': userID,
|
|
|
- 'region': lang,
|
|
|
- 'country': country
|
|
|
+ 'region': lang
|
|
|
}
|
|
|
- UserExModel.objects.create(**create_dict)
|
|
|
+ user_ex_qs = UserExModel.objects.create(**create_dict)
|
|
|
+
|
|
|
+ country_ip_qs = CountryIPModel.objects.filter(user_ex_id=user_ex_qs[0].id)
|
|
|
+ if not country_ip_qs.exists():
|
|
|
+ countryIp = CountryIPModel(
|
|
|
+ ip=CommonService.get_ip_address(request),
|
|
|
+ add_time=now_time,
|
|
|
+ user_ex_id=user_ex_qs[0].id
|
|
|
+ )
|
|
|
+ countryIp.save()
|
|
|
+
|
|
|
# 获取设备是否存在有已被删除
|
|
|
res = {'usmsg': 0} # 预留字段, 有版本app该字段去掉会报错
|
|
|
return response.json(0, res)
|