瀏覽代碼

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

locky 1 年之前
父節點
當前提交
b459a66375
共有 2 個文件被更改,包括 7 次插入9 次删除
  1. 2 7
      Controller/EquipmentManagerV3.py
  2. 5 2
      Service/CommonService.py

+ 2 - 7
Controller/EquipmentManagerV3.py

@@ -350,13 +350,8 @@ class EquipmentManagerV3(View):
                     else:
                     else:
                         data_list = [{'userID': userID, 'UID': UID, 'uid_nick': NickName, 'password': encrypt_pass}]
                         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)
                 LogModel.objects.create(**log)

+ 5 - 2
Service/CommonService.py

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