|
@@ -7,7 +7,8 @@ from django.views.decorators.csrf import csrf_exempt
|
|
from django.views.generic.base import View
|
|
from django.views.generic.base import View
|
|
|
|
|
|
from Ansjer.config import BASE_DIR, SERVER_DOMAIN
|
|
from Ansjer.config import BASE_DIR, SERVER_DOMAIN
|
|
-from Model.models import Equipment_Version
|
|
|
|
|
|
+from Model.models import Equipment_Version, EquipmentVersionLimitModel, CountryIPModel
|
|
|
|
+from Object.RedisObject import RedisObject
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.ResponseObject import ResponseObject
|
|
from Object.TokenObject import TokenObject
|
|
from Object.TokenObject import TokenObject
|
|
from Object.UrlTokenObject import UrlTokenObject
|
|
from Object.UrlTokenObject import UrlTokenObject
|
|
@@ -284,6 +285,23 @@ class EquipmentVersionView(View):
|
|
# 判断大小
|
|
# 判断大小
|
|
if ov > eqs[0].softwareVersion:
|
|
if ov > eqs[0].softwareVersion:
|
|
return response.json(0, {'softwareVersion': ov})
|
|
return response.json(0, {'softwareVersion': ov})
|
|
|
|
+ equipment = eqs[0]
|
|
|
|
+ redisObject = RedisObject()
|
|
|
|
+ key = 'limit_{eid}'.format(eid=equipment.eid)
|
|
|
|
+
|
|
|
|
+ evl_qs = redisObject.get_data(key=key)
|
|
|
|
+ if evl_qs:
|
|
|
|
+ evl_qs = json.loads(evl_qs)
|
|
|
|
+ else:
|
|
|
|
+ evl_qs = EquipmentVersionLimitModel.objects.filter(equipment_version_id=equipment.eid, status=1).values()
|
|
|
|
+ if evl_qs.exists():
|
|
|
|
+ redisObject.set_data(key=key, val=json.dumps(list(evl_qs.values())), expire=600)
|
|
|
|
+ if evl_qs and len(evl_qs) > 0:
|
|
|
|
+ evl = evl_qs[0]
|
|
|
|
+ if evl['type'] == 1: # uid限制
|
|
|
|
+ uids = json.loads(evl['content'])
|
|
|
|
+ if not uids.__contains__(uid):
|
|
|
|
+ return response.json(902)
|
|
file_path = eqs[0].filePath
|
|
file_path = eqs[0].filePath
|
|
if file_path.find('static/Upgrade/') != -1:
|
|
if file_path.find('static/Upgrade/') != -1:
|
|
path = file_path.replace('static/Upgrade/', '').replace('\\', '/')
|
|
path = file_path.replace('static/Upgrade/', '').replace('\\', '/')
|