Просмотр исходного кода

Merge branch 'pzb' of http://192.168.136.45:3000/SERVER/AnsjerServer into pzb

pzb 6 лет назад
Родитель
Сommit
aff6dc17ba
2 измененных файлов с 1 добавлено и 2 удалено
  1. 0 1
      Controller/DeviceShare.py
  2. 1 1
      Controller/EquipmentManager.py

+ 0 - 1
Controller/DeviceShare.py

@@ -61,7 +61,6 @@ class DeviceShareView(View):
         UID = request_dict.get('UID', None)
         dvqs = Device_Info.objects.filter(UID=UID, userID_id=userID, isShare=False)
         if dvqs.exists():
-            import time
             data = {'sharer': userID, 'UID': UID}
             share_token = jwt.encode(data, 'jwt.#^^&', algorithm='HS256')
             share_url = '{SERVER_DOMAIN}deviceShare/confirm?shareToken={shareToken}' \

+ 1 - 1
Controller/EquipmentManager.py

@@ -298,7 +298,7 @@ def addInterface(request):
     View_Password = request_dict.get('View_Password', None)
     Type = request_dict.get('Type', None)
     ChannelIndex = request_dict.get('ChannelIndex', None)
-    if all([UID, NickName, View_Account, View_Password, Type, ChannelIndex]):
+    if all([UID, NickName, View_Account, Type, ChannelIndex]):
         tko = TokenObject(token)
         response.lang = tko.lang
         if tko.code == 0: