Merge remote-tracking branch 'origin/master'

# Conflicts:
#	Controller/ShadowController.py

.gitignore

@@ -1,5 +1,6 @@
 /.idea
 /static
+/AnsjerPush/file/
 /Model/migrations
 /AnsjerPush/file/apns_pem/
 /Ansjer/__pycache__

Controller/ShadowController.py

@@ -58,6 +58,7 @@ def generate_utk(request):
 
 
 # 设备影子更新
+@ratelimit(key='ip', rate='100/1m', block=True)
 def update_device_shadow(request):
     request.encoding = 'utf-8'
     if request.method == 'POST':
@@ -136,7 +137,6 @@ def update_device_shadow(request):
         is_ptz = request_dict.get('is_ptz', None)
         is_ai = request_dict.get('is_ai', None)
         isSupportFourPoint = request_dict.get('isSupportFourPoint', None)
-        is_vod = request_dict.get('is_vod', None)
 
         # 更新
         qs_dict = {
@@ -176,8 +176,6 @@ def update_device_shadow(request):
             qs_dict['is_ai'] = is_ai
         if isSupportFourPoint:
             qs_dict['isSupportFourPoint'] = isSupportFourPoint
-        if is_vod:
-            qs_dict['is_vod'] = is_vod
         logger.info('{} qs_dict: {}'.format(uid, qs_dict))
 
         us_qs = UidSetModel.objects.filter(uid=uid)