取消异步请求Alexa服务器更新事件网关

Controller/EquipmentManager.py

@@ -258,14 +258,9 @@ def modifyUserEquipmentInterface(request):
                 encrypt_pwd = ''
                 if deviceData.__contains__('View_Password'):
                     encrypt_pwd = deviceData['View_Password']
-                # 异步请求Alexa服务器更新事件网关
                 data_list = [{'userID': userID, 'UID': uid, 'uid_nick': nickname, 'password': encrypt_pwd}]
-                data_list = json.dumps(data_list)
-                data = {'data_list': data_list}
-                alexa_thread = threading.Thread(
-                    target=CommonService.update_alexa_events,
-                    kwargs=data)
-                alexa_thread.start()
+                # 请求Alexa服务器更新事件网关
+                CommonService.update_alexa_events(data_list)
         return response.json(0, res)
 
 
@@ -523,13 +518,8 @@ def addInterface(request):
                             data_list = [
                                 {'userID': userID, 'UID': UID, 'uid_nick': NickName, 'password': View_Password}]
 
-                        # 异步请求Alexa服务器更新事件网关
-                        data_list = json.dumps(data_list)
-                        data = {'data_list': data_list}
-                        alexa_thread = threading.Thread(
-                            target=CommonService.update_alexa_events,
-                            kwargs=data)
-                        alexa_thread.start()
+                        # 请求Alexa服务器更新事件网关
+                        CommonService.update_alexa_events(data_list)
                 except Exception as e:
                     return response.json(10, repr(e))
                 else:

Controller/EquipmentManagerV3.py

@@ -350,13 +350,8 @@ class EquipmentManagerV3(View):
                     else:
                         data_list = [{'userID': userID, 'UID': UID, 'uid_nick': NickName, 'password': encrypt_pass}]
 
-                    # 异步请求Alexa服务器更新事件网关
-                    data_list = json.dumps(data_list)
-                    data = {'data_list': data_list}
-                    alexa_thread = threading.Thread(
-                        target=CommonService.update_alexa_events,
-                        kwargs=data)
-                    alexa_thread.start()
+                    # 请求Alexa服务器更新事件网关
+                    CommonService.update_alexa_events(data_list)
 
                 # 记录添加日志
                 LogModel.objects.create(**log)
@@ -614,13 +609,8 @@ class EquipmentManagerV3(View):
                     else:
                         data_list = [{'userID': userID, 'UID': UID, 'uid_nick': NickName, 'password': encryptPassword}]
 
-                    # 异步请求Alexa服务器更新事件网关
-                    data_list = json.dumps(data_list)
-                    data = {'data_list': data_list}
-                    alexa_thread = threading.Thread(
-                        target=CommonService.update_alexa_events,
-                        kwargs=data)
-                    alexa_thread.start()
+                    # 请求Alexa服务器更新事件网关
+                    CommonService.update_alexa_events(data_list)
 
                 dvqs = Device_Info.objects.filter(id=id).values('id', 'userID', 'NickName', 'UID',
                                                                 'View_Account',
@@ -728,12 +718,8 @@ class EquipmentManagerV3(View):
                     # 异步请求Alexa服务器更新事件网关
                     password = encrypt_pwd if deviceData.__contains__('View_Password') else ''
                     data_list = [{'userID': userID, 'UID': uid, 'uid_nick': nickname, 'password': password}]
-                    data_list = json.dumps(data_list)
-                    data = {'data_list': data_list}
-                    alexa_thread = threading.Thread(
-                        target=CommonService.update_alexa_events,
-                        kwargs=data)
-                    alexa_thread.start()
+                    # 请求Alexa服务器更新事件网关
+                    CommonService.update_alexa_events(data_list)
 
             return response.json(0, res)
 

Controller/UidSetController.py

@@ -402,14 +402,9 @@ class UidSetView(View):
                 uid_channel_set_qs.update(**deviceData)
 
             if uidObject[0].is_alexa == 1 and 'channel_name' in deviceData.keys():
-                # 异步请求Alexa服务器更新事件网关
                 data_list = [{'userID': userID, 'UID': uid, 'uid_nick': deviceData['channel_name'], 'password': ''}]
-                data_list = json.dumps(data_list)
-                data = {'data_list': data_list}
-                alexa_thread = threading.Thread(
-                    target=CommonService.update_alexa_events,
-                    kwargs=data)
-                alexa_thread.start()
+                # 请求Alexa服务器更新事件网关
+                CommonService.update_alexa_events(data_list)
 
         except Exception as e:
             return response.json(177, repr(e))

Service/CommonService.py

@@ -867,17 +867,20 @@ GCqvlyw5dfxNA+EtxNE2wCW/LW7ENJlACgcfgPlBZtpLheWoZB/maw4=
         return c_serial_info[0]['serial_number'] + c_serial_info[0]['mark']
 
     @staticmethod
-    def update_alexa_events(data):
+    def update_alexa_events(data_list):
         """
         请求Alexa服务器更新事件网关
         邮件提醒捕获的异常
-        @param data: 请求参数
+        @param data_list: 数据列表
         @return:
         """
         try:
+            data_list = json.dumps(data_list)
+            data = {'data_list': data_list}
             url = ALEXA_DOMAIN + 'deviceStatus/addOrUpdateV2'
             requests.post(url, data=data, timeout=30)
         except Exception as e:
             S3Email().faEmail(
                 '请求Alexa服务器更新事件网关异常:error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)),
                 'servers@ansjer.com')
+            pass