|
@@ -48,10 +48,7 @@ class SerialNumberView(View):
|
|
|
elif operation == 'detachUID': # 解绑uid
|
|
|
return self.do_detach_uid(request, request_dict, response)
|
|
|
elif operation == 'get-uid': # app获取uid
|
|
|
- token_code, user_id, response = CommonService.verify_token_get_user_id(request_dict, request)
|
|
|
- if token_code != 0:
|
|
|
- return response.json(token_code)
|
|
|
- response = uidManageResponseObject()
|
|
|
+ token_code, user_id, res = CommonService.verify_token_get_user_id(request_dict, request)
|
|
|
return self.get_uid(request_dict, response, request, user_id)
|
|
|
elif operation == 'create': # 创建序列号
|
|
|
return self.do_create(request_dict, response)
|
|
@@ -672,9 +669,11 @@ class SerialNumberView(View):
|
|
|
ip = CommonService.get_ip_address(request)
|
|
|
# 查询用户国家id
|
|
|
region_country = 0
|
|
|
- device_user_qs = Device_User.objects.filter(userID=user_id).values('region_country')
|
|
|
- if device_user_qs.exists():
|
|
|
- region_country = device_user_qs[0]['region_country']
|
|
|
+ # ios请求头没传token,user_id为None
|
|
|
+ if user_id:
|
|
|
+ device_user_qs = Device_User.objects.filter(userID=user_id).values('region_country')
|
|
|
+ if device_user_qs.exists():
|
|
|
+ region_country = device_user_qs[0]['region_country']
|
|
|
data = {
|
|
|
'ip': ip,
|
|
|
'update_time': now_time,
|