Browse Source

更新修改设备时,向alexa传password字段

lang 4 năm trước cách đây
mục cha
commit
a3b830e862
2 tập tin đã thay đổi với 9 bổ sung4 xóa
  1. 6 2
      Controller/EquipmentManagerV3.py
  2. 3 2
      Service/ModelService.py

+ 6 - 2
Controller/EquipmentManagerV3.py

@@ -63,6 +63,7 @@ class EquipmentManagerV3(View):
         NickName = request_dict.get('NickName', None)
         View_Account = request_dict.get('View_Account', None)
         View_Password = request_dict.get('View_Password', '')
+        encrypt_pass = View_Password
         print("准备解密")
         View_Password = self.decode_pwd(View_Password)
         Type = request_dict.get('Type', None)
@@ -173,7 +174,8 @@ class EquipmentManagerV3(View):
                             us_qs = UidSetModel.objects.filter(uid=UID)
 
                         if us_qs.exists() and us_qs[0].is_alexa == 1:
-                            asy = threading.Thread(target=ModelService.notify_alexa_add, args=(UID, userID, NickName))
+                            asy = threading.Thread(target=ModelService.notify_alexa_add,
+                                                   args=(UID, userID, NickName, encrypt_pass))
                             asy.start()
 
                         # redisObj = RedisObject(db=8)
@@ -235,6 +237,7 @@ class EquipmentManagerV3(View):
 
             # print(deviceData['View_Password'])
             if deviceData.__contains__('View_Password'):
+                encrypt_pwd = deviceData['View_Password']
                 deviceData['View_Password'] = self.decode_pwd(deviceData['View_Password'])
             dev_info_qs = Device_Info.objects.filter(userID_id=userID, id=id)
             dev_info_qs.update(**deviceData)
@@ -267,7 +270,8 @@ class EquipmentManagerV3(View):
                 di_qs = Device_Info.objects.filter(UID=uid)
                 di_qs.update(NickName=nickname)
                 if deviceData is not None and deviceData.__contains__('NickName') and us_qs[0].is_alexa == 1:
-                    asy = threading.Thread(target=ModelService.notify_alexa_add, args=(uid, userID, nickname))
+                    password = encrypt_pwd if deviceData.__contains__('View_Password') else ''
+                    asy = threading.Thread(target=ModelService.notify_alexa_add, args=(uid, userID, nickname, password))
                     asy.start()
             # redisObj = RedisObject(db=8)
             # redisObj.del_data(key='uid_qs_' + userID)

+ 3 - 2
Service/ModelService.py

@@ -160,12 +160,13 @@ class ModelService:
 
 
     @staticmethod
-    def notify_alexa_add(uid, userID, nickname):
+    def notify_alexa_add(uid, userID, nickname, encrypt_pwd):
         url = 'https://www.zositech.xyz/deviceStatus/addOrUpdate'
         data = {
             'UID': uid,
             'userID': userID,
-            'uid_nick': nickname
+            'uid_nick': nickname,
+            'password': encrypt_pwd,
         }
         try:
             res = requests.post(url, data=data, timeout=5)