|
@@ -1,12 +1,12 @@
|
|
|
import hashlib
|
|
|
+import logging
|
|
|
import os
|
|
|
-import simplejson as json
|
|
|
import time
|
|
|
import traceback
|
|
|
-
|
|
|
from wsgiref.util import FileWrapper
|
|
|
from zlib import crc32
|
|
|
|
|
|
+import simplejson as json
|
|
|
from django.http import HttpResponse
|
|
|
from django.utils.decorators import method_decorator
|
|
|
from django.views.decorators.csrf import csrf_exempt
|
|
@@ -14,7 +14,6 @@ from django.views.generic import TemplateView
|
|
|
|
|
|
from Ansjer.config import BASE_DIR
|
|
|
from Ansjer.config import SERVER_DOMAIN
|
|
|
-from Ansjer.config import SERVER_TYPE
|
|
|
from Model.models import Device_User, EquipmentVersionLimitModel, CountryIPModel, DeviceOTAUpgradeRecord
|
|
|
from Model.models import Equipment_Version
|
|
|
from Object.RedisObject import RedisObject
|
|
@@ -494,7 +493,7 @@ def getNewVerInterface(request):
|
|
|
else:
|
|
|
equipmentValid = Equipment_Version.objects.filter(code=code, status=1, lang='en').order_by(
|
|
|
'-data_joined')
|
|
|
-
|
|
|
+ logger = logging.getLogger('info')
|
|
|
if equipmentValid.exists():
|
|
|
equipment = equipmentValid[0]
|
|
|
redisObject = RedisObject()
|
|
@@ -538,9 +537,11 @@ def getNewVerInterface(request):
|
|
|
url_tko = UrlTokenObject()
|
|
|
file_path = url_tko.generate(
|
|
|
data={'Url': "ansjer/" + CommonService.RandomStr(6) + "/" + file_path, 'user_id': tko.userID,
|
|
|
- 'uid': uid, 'serial_number': serial_number, 'old_version': "V" + now_ver + "." + code,'new_version': version, 'mci': mci})
|
|
|
+ 'uid': uid, 'serial_number': serial_number, 'old_version': "V" + now_ver + "." + code,
|
|
|
+ 'new_version': version, 'mci': mci})
|
|
|
url = SERVER_DOMAIN + 'dlotapack/' + file_path
|
|
|
- print(url)
|
|
|
+ logger.info('<<<<<<<获取ota token={}'.format(file_path))
|
|
|
+ logger.info('<<<<<<<URL={}'.format(url))
|
|
|
# if SERVER_TYPE == 'Ansjer.formal_settings':
|
|
|
# url = SERVER_DOMAIN + 'dlotapack/' + file_path
|
|
|
# else:
|
|
@@ -692,7 +693,7 @@ def downloadOTAInterfaceV2(request, fullPath, *callback_args, **callback_kwargs)
|
|
|
response['Content-CRC32'] = getMD5orSHA265(fullPath, 'CRC32')
|
|
|
response['Content-Error'] = res.formal(0)
|
|
|
|
|
|
- #设备下载OTA包,记录数据库
|
|
|
+ # 设备下载OTA包,记录数据库
|
|
|
# 记录设备OTA升级
|
|
|
createdTime = int(time.time())
|
|
|
DeviceOTAUpgradeRecord.objects.create(
|
|
@@ -782,4 +783,3 @@ def checkMaxVersion(request):
|
|
|
}
|
|
|
|
|
|
return response.json(0, res)
|
|
|
-
|