更改token code以及ota模块修正

Controller/AccessLog.py

@@ -57,7 +57,7 @@ class AccessLog(View):
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
 
     def query_by_admin(self, request_dict, userID, response):
         page = int(request_dict.get('page', None))

Controller/AdminManage.py

@@ -66,7 +66,7 @@ class AdminManage(TemplateView):
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
 
     def resetUserPwd(self, request_dict, userID,response):
         own_permission = ModelService.check_permission(userID=userID, permID=50)
@@ -221,7 +221,7 @@ def getUserIds(request):
         else:
             return response.json(tko.code)
     else:
-        return response.json(311)
+        return response.json(309)
 
 @csrf_exempt
 def search_user_by_content(request):
@@ -296,7 +296,7 @@ def search_user_by_content(request):
         else:
             return response.json(tko.code)
     else:
-        return response.json(311)
+        return response.json(309)
 
 
 

Controller/AppInfo.py

@@ -55,7 +55,7 @@ class AppInfo(View):
                     else:
                         return response.json(tko.code)
                 else:
-                    return response.json(311)
+                    return response.json(309)
         else:
             return response.json(444,'operation')
 

Controller/DeviceLog.py

@@ -110,4 +110,4 @@ def DeviceLog(request, uid):
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)

Controller/DeviceManage.py

@@ -65,7 +65,7 @@ class DeviceManage(View):
                 else:
                     return response.json(tko.code)
             else:
-                return response.json(311)
+                return response.json(309)
         else:
             return response.json(444)
 
@@ -174,4 +174,4 @@ def Devices(request, UID):
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)

Controller/DeviceMeal.py

@@ -81,7 +81,7 @@ class DeviceMeal(View):
                 else:
                     return response.json(tko.code)
             else:
-                return response.json(311)
+                return response.json(309)
         else:
             return response.json(444, 'operation')
 

Controller/EquipmentInfo.py

@@ -62,7 +62,7 @@ class EquipmentInfo(View):
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
 
     def add_info(self, request_dict, userID,response):
         devUid = request_dict.get('devUid', None)

Controller/EquipmentManager.py

@@ -221,7 +221,7 @@ def queryUserEquipmentInterface(request, *callback_args,
                         else:
                             return response.json(113)
             else:
-                return response.json(310)
+                return response.json(309)
         else:
             return response.json(tko.code)
     else:
@@ -251,7 +251,7 @@ def addNewUserEquipmentInterface(request, *callback_args,
             if userID is not None:
                 return addNewUserEquipment(userID, deviceContent, response)
             else:
-                return response.json(310)
+                return response.json(309)
         else:
             return response.json(tko.code)
     else:
@@ -288,7 +288,7 @@ def delUserEquipmentInterface(request, *callback_args,
             if userID is not None:
                 return delUserEquipment(userID, id, response)
             else:
-                return response.json(310)
+                return response.json(309)
         else:
             return response.json(tko.code)
     else:
@@ -324,7 +324,7 @@ def modifyUserEquipmentInterface(request, *callback_args,
             if userID is not None:
                 return modifyUserEquipment(userID, deviceContent, id, response)
             else:
-                return response.json(310)
+                return response.json(309)
         else:
             return response.json(tko.code)
     else:
@@ -354,7 +354,7 @@ def showAllUserEquipmentInterface(request, *callback_args, **callback_kwargs):
                 else:
                     return showAllUserEquipment(userID, response)
             else:
-                return response.json(310)
+                return response.json(309)
         else:
             return response.json(tko.code)
     else:

Controller/EquipmentOTA.py

@@ -56,11 +56,11 @@ class EquipmentOTA(View):
                             return self.update(request_dict, userID, response)
                     return response.json(444, 'operation')
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
 
     def delete(self, request_dict, userID,response):
         eid = request_dict.get('eid', None)

Controller/EquipmentSensor.py

@@ -84,11 +84,11 @@ class EquipmentSensor(View):
                     elif operation == 'queryall':
                         return self.admin_query_all_sensor(request_dict, userID,response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
 
 
     def add_sensor(self, request_dict,userID,response):

Controller/FeedBackInfo.py

@@ -62,11 +62,11 @@ class FeedBackInfo(View):
                     else:
                         return response.json(444,'444')
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
 
     def add_info(self, request_dict, userID,response):
         content = request_dict.get('content', None)

Controller/HlsManage.py

@@ -146,11 +146,11 @@ class HlsManage(View):
                     else:
                         return response.json(444,'uid,channel')
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
 
     def get_hls_vod(self, request_dict,response):
         token = request_dict.get('token', None)
@@ -194,11 +194,11 @@ class HlsManage(View):
                     else:
                         return response.json(15)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
         
     # mp4
     def get_vod_url(self, request_dict,response):
@@ -231,11 +231,11 @@ class HlsManage(View):
                     else:
                         return response.json(15)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
 
 
 

Controller/LogAccess.py

@@ -57,8 +57,8 @@ def LogAccess(request):
                     else:
                         return response.json(444,'page,line')
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)

Controller/LogManager.py

@@ -218,7 +218,7 @@ def upload_help_chm(request):
         else:
             return response.json(tko.code)
     else:
-        return response.json(311)
+        return response.json(309)
 
 @csrf_exempt
 def errorPath(request,**kwargs):

Controller/MealManage.py

@@ -67,11 +67,11 @@ class MealManage(View):
                     else:
                         return response.json(444, 'operation')
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
 
     def add(self, request_dict, userID, response):
         own_perm = ModelService.check_permission(userID=userID, permID=40)

Controller/OTAEquipment.py

@@ -65,7 +65,7 @@ def addNewEquipmentVersion(deviceContent, token, response):
                 return response.json(404)
 
     else:
-        return response.json(311)
+        return response.json(309)
 
 
 def downloadUrl(fileType, fileCode, fileVersion, fileName):
@@ -356,7 +356,7 @@ class getUploadFiletoDirView(TemplateView):
                     else:
                         return response.json(404)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
@@ -514,7 +514,7 @@ def getNewVerInterface(request):
                     equipmentValid = Equipment_Version.objects.filter(code=code, status=1, lang=lang).order_by(
                         '-data_joined')
                 else:
-                    equipmentValid = Equipment_Version.objects.filter(code=code, status=1).order_by('-data_joined')
+                    equipmentValid = Equipment_Version.objects.filter(code=code, status=1,lang='').order_by('-data_joined')
             except Exception as e:
                 return response.json(500, {'details': repr(e)})
             else:
@@ -578,7 +578,7 @@ class uploadOTAInterfaceView(TemplateView):
                     else:
                         return response.json(404)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:

Controller/PermissionManager.py

@@ -294,7 +294,7 @@ class queryRoleView(View):
                 if userID:
                     return self.queryUserRole(userID,response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
@@ -345,7 +345,7 @@ class addNewRoleView(View):
 
                     return self.AddNewUserRole(userID, content,response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
 
@@ -405,7 +405,7 @@ class delRoleView(View):
                 if userID:
                     return self.delRole(userID, int(rid),response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
@@ -450,7 +450,7 @@ class modifyRoleView(View):
                 if userID:
                     return self.modifyRole(userID, int(rid), content,response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
@@ -508,7 +508,7 @@ class addNewPermsView(View):
                     if type == 'PC':
                         return self.addNewPermission(userID=userID, request_dict=request_dict,response=response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
@@ -561,7 +561,7 @@ class delPermsView(View):
                 if userID:
                     return self.delPerms(userID, id,response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
@@ -621,7 +621,7 @@ class queryPermsView(View):
                     else:
                         return self.delPerms(userID,response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
@@ -688,7 +688,7 @@ class modifyPermsView(View):
                     update_dict = {'permName':request_dict['permName'],'description':request_dict['description']}
                     return self.modifyPerms(userID=userID,id=request_dict['id'], update_dict=update_dict,response=response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
@@ -752,7 +752,7 @@ class queryRolePermsView(View):
                 if userID:
                     return self.queryRolePerms(userID, allUser,response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:

Controller/StreamMedia.py

@@ -120,7 +120,7 @@ class StreamMedia(View):
             else:
                 return response.json(tko.code)
         else:
-            return response.json(311)
+            return response.json(309)
 
     def add_stream(self, token, userID, request_dict, response):
         channel = request_dict.get('channel', None)

Controller/UserManger.py

@@ -51,7 +51,7 @@ class showUserMoreView(TemplateView):
                 if userID:
                     return self.showUserMore(userID, response)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
@@ -142,7 +142,7 @@ class perfectUserInfoView(TemplateView):
                         return self.perfectUserInfoUpdate(userID, response, userIconPath=userIconPath,
                                                           userContent=userContent)
                 else:
-                    return response.json(310)
+                    return response.json(309)
             else:
                 return response.json(tko.code)
         else:
@@ -277,7 +277,7 @@ def delUserInterface(request):
                     else:
                         return response.json(113)
             else:
-                return response.json(310)
+                return response.json(309)
         else:
             return response.json(tko.code)
     else:
@@ -364,7 +364,7 @@ def showAllUserInterface(request):
                 else:
                     return showAllUser(userID, response)
             else:
-                return response.json(310)
+                return response.json(309)
         else:
             return response.json(tko.code)
     else:

Object/ResponseObject.py

@@ -11,8 +11,6 @@ class ResponseObject(object):
         self.lang = lang
 
     def data(self, code, res={}):
-        if code == 310 or code == 310:
-            code = 309
         data_en = {
             0: 'Success',
             4: 'Operation failed',
@@ -61,10 +59,7 @@ class ResponseObject(object):
             194: 'Update role error',
             195: 'role can not be updated!',
             306: 'The link has expired!',
-            307: 'Please ReLogin! errcode:307!', # The Token has expired!
             309: 'Please ReLogin! errmsg token',
-            310: 'Please ReLogin! errcode:310!', # The userID in the token is None!
-            311: 'Please ReLogin! errcode:311!', # The token is None!
             403: 'API ERROR!',
             404: 'You don not have permission to access this!',
             414: 'Client error ! Please confirm the request path!',
@@ -151,9 +146,7 @@ class ResponseObject(object):
             194: '更新角色错误',
             195: '未知的错误导致角色无法更新！',
             306: '链接已超过有效期!',
-            307: '请重新登录! 令牌已经过期！',
-            310: '请重新登录! 令牌用户名不存在！',
-            311: '请重新登录! 令牌为空！',
+            309: '请重新登录!',
             403: 'API错误！',
             404: '您没有访问的权限！',
             414: '客户端错误！请确认请求路径！',