Эх сурвалжийг харах

修复删除相同用户bug

peng 2 жил өмнө
parent
commit
d7838f9c90

+ 8 - 9
Controller/UserController.py

@@ -691,15 +691,13 @@ class refreshTokenViewV3(TemplateView):
     def delete_user_and_device(user_id):
     def delete_user_and_device(user_id):
         # 删除不同区域相同用户
         # 删除不同区域相同用户
         data = {'userID': user_id}
         data = {'userID': user_id}
-        if CONFIG_INFO == CONFIG_US:
-            url_list = [SERVER_DOMAIN_EUR + 'v3/account/deleteUser', SERVER_DOMAIN_CN + 'v3/account/deleteUser']
-        elif CONFIG_INFO == CONFIG_EUR:
-            url_list = [SERVER_DOMAIN_US + 'v3/account/deleteUser', SERVER_DOMAIN_CN + 'v3/account/deleteUser']
-        elif CONFIG_INFO == CONFIG_CN:
-            # url_list = [SERVER_DOMAIN_US + 'v3/account/deleteUser', SERVER_DOMAIN_EUR + 'v3/account/deleteUser']
-            url_list = [SERVER_DOMAIN_TEST + 'v3/account/deleteUser']
+        url_list = CommonService.get_orders_domain_name_list()
+        if SERVER_DOMAIN_TEST in url_list:
+            url_list.remove(SERVER_DOMAIN_TEST)
+        if SERVER_DOMAIN_EUR in url_list:
+            url_list.remove(SERVER_DOMAIN_EUR)
         for url in url_list:
         for url in url_list:
-            res = requests.get(url=url, data=data)
+            requests.post(url=url+'v3/account/deleteUser', data=data, timeout=3)
 
 
     def validation(self, request_dict):
     def validation(self, request_dict):
         token = request_dict.get('token', None)
         token = request_dict.get('token', None)
@@ -747,7 +745,6 @@ class refreshTokenViewV3(TemplateView):
             # 删除相同用户
             # 删除相同用户
             request_thread = threading.Thread(target=self.delete_user_and_device, args=(userID,))
             request_thread = threading.Thread(target=self.delete_user_and_device, args=(userID,))
             request_thread.start()
             request_thread.start()
-
             return response.json(0, res)
             return response.json(0, res)
         except Exception as e:
         except Exception as e:
             print(e)
             print(e)
@@ -4360,6 +4357,8 @@ class DeleteUser(View):
         response = ResponseObject('cn')
         response = ResponseObject('cn')
         try:
         try:
             user_id = request_dict.get('userID', None)
             user_id = request_dict.get('userID', None)
+            if not user_id:
+                return response.json(444)
             Device_User.objects.filter(userID=user_id).delete()
             Device_User.objects.filter(userID=user_id).delete()
             Device_Info.objects.filter(userID=user_id).delete()
             Device_Info.objects.filter(userID=user_id).delete()
             return response.json(0)
             return response.json(0)