Merge remote-tracking branch 'origin/master'

Controller/EquipmentOTA.py

@@ -8,7 +8,7 @@ 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 Ansjer.config import BASE_DIR, SERVER_DOMAIN, SERVER_DOMAIN_OTA
 from Model.models import Equipment_Version, EquipmentVersionLimitModel
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
@@ -355,7 +355,7 @@ class EquipmentVersionView(View):
         max_ver = equipment.max_ver
         if now_ver > max_ver:
             return response.json(902)
-        url = SERVER_DOMAIN + 'OTA/downloadsPack/' + file_path
+        url = SERVER_DOMAIN_OTA + 'OTA/downloadsPack/' + file_path
         file_name = file_path[file_path.rindex('/')+1:]
         res = {
             "url": url,