|
@@ -691,18 +691,14 @@ class refreshTokenViewV3(TemplateView):
|
|
|
# 删除不同区域相同用户
|
|
# 删除不同区域相同用户
|
|
|
data = {'userID': user_id}
|
|
data = {'userID': user_id}
|
|
|
if CONFIG_INFO == CONFIG_US:
|
|
if CONFIG_INFO == CONFIG_US:
|
|
|
- url1 = SERVER_DOMAIN_EUR + 'v3/account/deleteUser'
|
|
|
|
|
- url2 = SERVER_DOMAIN_CN + 'v3/account/deleteUser'
|
|
|
|
|
|
|
+ url_list = [SERVER_DOMAIN_EUR + 'v3/account/deleteUser', SERVER_DOMAIN_CN + 'v3/account/deleteUser']
|
|
|
elif CONFIG_INFO == CONFIG_EUR:
|
|
elif CONFIG_INFO == CONFIG_EUR:
|
|
|
- url1 = SERVER_DOMAIN_US + 'v3/account/deleteUser'
|
|
|
|
|
- url2 = SERVER_DOMAIN_CN + 'v3/account/deleteUser'
|
|
|
|
|
|
|
+ url_list = [SERVER_DOMAIN_US + 'v3/account/deleteUser', SERVER_DOMAIN_CN + 'v3/account/deleteUser']
|
|
|
elif CONFIG_INFO == CONFIG_CN:
|
|
elif CONFIG_INFO == CONFIG_CN:
|
|
|
- # url1 = SERVER_DOMAIN_US + 'v3/account/deleteUser'
|
|
|
|
|
- # url2 = SERVER_DOMAIN_EUR + 'v3/account/deleteUser'
|
|
|
|
|
- url1 = SERVER_DOMAIN_TEST + 'v3/account/deleteUser'
|
|
|
|
|
-
|
|
|
|
|
- requests.get(url=url1, data=data)
|
|
|
|
|
- # requests.get(url=url2, data=data)
|
|
|
|
|
|
|
+ # url_list = [SERVER_DOMAIN_US + 'v3/account/deleteUser', SERVER_DOMAIN_EUR + 'v3/account/deleteUser']
|
|
|
|
|
+ url_list = [SERVER_DOMAIN_TEST + 'v3/account/deleteUser']
|
|
|
|
|
+ for url in url_list:
|
|
|
|
|
+ requests.get(url=url, data=data)
|
|
|
|
|
|
|
|
def validation(self, request_dict):
|
|
def validation(self, request_dict):
|
|
|
token = request_dict.get('token', None)
|
|
token = request_dict.get('token', None)
|
|
@@ -748,7 +744,7 @@ class refreshTokenViewV3(TemplateView):
|
|
|
}
|
|
}
|
|
|
user_ex_qs.update(**update_dict)
|
|
user_ex_qs.update(**update_dict)
|
|
|
# 删除相同用户
|
|
# 删除相同用户
|
|
|
- request_thread = threading.Thread(target=refreshTokenViewV3.delete_user_and_device, args=userID)
|
|
|
|
|
|
|
+ request_thread = threading.Thread(target=refreshTokenViewV3.delete_user_and_device, args=(userID,))
|
|
|
request_thread.start()
|
|
request_thread.start()
|
|
|
|
|
|
|
|
return response.json(0, res)
|
|
return response.json(0, res)
|
|
@@ -4359,7 +4355,7 @@ class DeleteUser(View):
|
|
|
request_dict = request.POST
|
|
request_dict = request.POST
|
|
|
return self.validate(request, request_dict)
|
|
return self.validate(request, request_dict)
|
|
|
|
|
|
|
|
- def validate(self, request_dict):
|
|
|
|
|
|
|
+ def validate(self, request, request_dict):
|
|
|
response = ResponseObject('cn')
|
|
response = ResponseObject('cn')
|
|
|
user_id = request_dict.get('userID', None)
|
|
user_id = request_dict.get('userID', None)
|
|
|
Device_User.objects.filter(userID=user_id).delete()
|
|
Device_User.objects.filter(userID=user_id).delete()
|
