|
@@ -1,20 +1,15 @@
|
|
|
-import hashlib
|
|
|
import os
|
|
|
-import uuid
|
|
|
-from wsgiref.util import FileWrapper
|
|
|
|
|
|
import simplejson as json
|
|
|
import time
|
|
|
|
|
|
-from django.http import HttpResponse
|
|
|
from django.utils import timezone
|
|
|
from django.utils.decorators import method_decorator
|
|
|
from django.views.decorators.csrf import csrf_exempt
|
|
|
from django.views.generic.base import View
|
|
|
|
|
|
from Ansjer.config import BASE_DIR, SERVER_DOMAIN
|
|
|
-from Controller.OTAEquipment import getMD5orSHA265
|
|
|
-from Model.models import Equipment_Version, EquipmentVersionLimitModel, CountryIPModel
|
|
|
+from Model.models import Equipment_Version, EquipmentVersionLimitModel
|
|
|
from Object.RedisObject import RedisObject
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
@@ -22,14 +17,6 @@ from Object.UrlTokenObject import UrlTokenObject
|
|
|
from Service.CommonService import CommonService
|
|
|
from Service.ModelService import ModelService
|
|
|
from django.db.models import Q
|
|
|
-'''
|
|
|
-http://192.168.136.45:8077/equipment/OTA?token=test&operation=query&page=1&line=10
|
|
|
-http://192.168.136.45:8077/equipment/OTA?token=test&operation=find&page=1&line=10&content={}
|
|
|
-http://192.168.136.40:8077/equipment/OTA?eid=138001524641441203480138000&token=test&operation=delete
|
|
|
-http://192.168.136.40:8077/equipment/OTA?eid=138001524641441203480138000&token=test&operation=update&status=1
|
|
|
-https://cdna.artstation.com/p/assets/images/images/004/727/674/large/daniel-dociu-snowcavels.jpg?1485828233&dl=1
|
|
|
-https://cdna.artstation.com/p/assets/images/images/004/693/910/large/daniel-dociu-smoothsailing.jpg?1485560128&dl=1
|
|
|
-'''
|
|
|
|
|
|
|
|
|
class EquipmentOTA(View):
|
|
@@ -148,7 +135,6 @@ class EquipmentOTA(View):
|
|
|
ev.update(status=status, update_time=update_time)
|
|
|
except Exception as e:
|
|
|
print(repr(e))
|
|
|
- pass
|
|
|
else:
|
|
|
return response.json(0, {'update_time': str(update_time)})
|
|
|
|
|
@@ -218,7 +204,7 @@ class EquipmentVersionView(View):
|
|
|
for chunk in file_s.chunks():
|
|
|
destination.write(chunk)
|
|
|
except Exception as e:
|
|
|
- pass
|
|
|
+ print(repr(e))
|
|
|
else:
|
|
|
img = SERVER_DOMAIN + 'sysfile/' + rv_path
|
|
|
if code is not None:
|
|
@@ -284,6 +270,10 @@ class EquipmentVersionView(View):
|
|
|
return response.json(444, 'code')
|
|
|
eqs = Equipment_Version.objects.filter(code=uid, status=1, lang='en').order_by('-data_joined')
|
|
|
|
|
|
+ # 限制NVR版本升级
|
|
|
+ if code == '681008800304A0001100000300001Z' and ov == '1.7.2':
|
|
|
+ return response.json(900)
|
|
|
+
|
|
|
if not eqs.exclude():
|
|
|
eqs = Equipment_Version.objects.filter(code=code, status=1, lang='en').order_by('-data_joined')
|
|
|
if not eqs.exists():
|