|
@@ -112,18 +112,15 @@ class UserBrandInfo(View):
|
|
latitude = latitude
|
|
latitude = latitude
|
|
else:
|
|
else:
|
|
status = 0
|
|
status = 0
|
|
- resp=urllib.request.urlopen('http://test.dvema.com/getTZ?etk=ODhVRlpMVjBZNU5VdEhVMVl6UVRsSE9URXhNVUUlM0Q4OA==&ip='+self.clientIP+'&lang=EN')
|
|
|
|
- html=resp.read()
|
|
|
|
- html.decode('utf-8')
|
|
|
|
- jsonData = json.loads(html)
|
|
|
|
- print(jsonData['data']['city_name'])
|
|
|
|
- country = jsonData['data']['country_name']
|
|
|
|
- province = jsonData[ 'data']['region_name']
|
|
|
|
- city = jsonData['data']['city_name']
|
|
|
|
|
|
+ jsonData = CommonService.getIpIpInfo(ip=self.clientIP,lang='EN')
|
|
|
|
+ print(jsonData['city_name'])
|
|
|
|
+ country = jsonData['country_name']
|
|
|
|
+ province = jsonData['region_name']
|
|
|
|
+ city = jsonData['city_name']
|
|
area = ''
|
|
area = ''
|
|
street = ''
|
|
street = ''
|
|
- longitude = jsonData['data']['longitude']
|
|
|
|
- latitude = jsonData['data']['latitude']
|
|
|
|
|
|
+ longitude = jsonData['longitude']
|
|
|
|
+ latitude = jsonData['latitude']
|
|
param_flag = CommonService.get_param_flag(data=[deviceSupplier, deviceModel,osType,osVersion])
|
|
param_flag = CommonService.get_param_flag(data=[deviceSupplier, deviceModel,osType,osVersion])
|
|
if param_flag is True:
|
|
if param_flag is True:
|
|
try:
|
|
try:
|