Merge branch 'dev' into lang

Controller/CloudTest.py

@@ -51,13 +51,16 @@ class cloudTestView(View):
             # 查询设备是否存在
             deviceInfo_qs = Device_Info.objects.filter(userID_id=oldUserID, UID=uid, isExist=1)
             if deviceInfo_qs[0]:
+                deviceUser_qs = Device_User.objects.filter(username=username).values('userID')
+                userID = deviceUser_qs[0]['userID']
+                # 判断该用户的userID是否跟转移的一样
+                if userID == oldUserID:
+                    return response.json(10008)
                 # 更新设备信息
-                deviceUser_qs = Device_User.objects.filter(username=username, isExist=1).values('userID')
-                userID = deviceUser_qs['userID']
-                nowTime = int(time.time())
-                deviceInfo_qs.update(userID=userID, update_time=nowTime)
+                else:
+                    deviceInfo_qs.update(userID=userID)
         except Exception as e:
-            print(e)
+            # print(e)
             return response.json(500, repr(e))
         else:
             return response.json(0)