优化json文件

Controller/AdminManage.py

@@ -79,7 +79,7 @@ class AdminManage(TemplateView):
             if is_update:
                 return response.json(0)
             else:
-                return response.json(106)
+                return response.json(177)
         else:
             return response.json(104)
 

Controller/AppInfo.py

@@ -102,7 +102,7 @@ class AppInfo(View):
             return response.json(424, {'details': errorInfo})
         else:
             if has_app_info.exists():
-                return response.json(60)
+                return response.json(174)
             else:
                 try:
                     app_Info = App_Info(

Controller/CheckUserData.py

@@ -39,47 +39,6 @@ def date_handler(obj):
     return obj.isoformat()
 
 
-class ModifyPwdView(TemplateView):
-    @method_decorator(csrf_exempt)
-    def dispatch(self, *args, **kwargs):
-        return super(ModifyPwdView, self).dispatch(*args, **kwargs)
-
-    def post(self, request, *args, **kwargs):
-        request.encoding = 'utf-8'
-        request_dict = request.POST
-
-        return self.ValidationError(request_dict)
-
-    def get(self, request, *args, **kwargs):
-        request.encoding = 'utf-8'
-        request_dict = request.GET
-
-        return self.ValidationError(request_dict)
-
-    def ValidationError(self, request_dict):
-        userEmail = request_dict.get('userEmail', None)
-        oldPwd = request_dict.get('oldPwd', None)
-        newPwd = request_dict.get('newPwd', None)
-
-        response = ResponseObject()
-        dataValid = DataValid()
-        if dataValid.password_validate(newPwd):
-            if oldPwd != newPwd:
-                return response.json(118)
-            try:
-                User = Device_User.objects.get(userEmail=userEmail)
-                User.userPwd = make_password(newPwd)
-                User.save()
-            except Exception as e:
-                errorInfo = traceback.format_exc()
-                print('更新密码到数据库: %s' % errorInfo)
-                return response.json(501, {'msg': repr(e)})
-            else:
-                return response.json(0)
-        else:
-            return response.json(109)
-
-
 class DataValid:
 
     def __init__(self):

Controller/CloudVod.py

@@ -228,9 +228,9 @@ class CloudVodView(View):
             format(SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
         # call_sub_url = "http://192.168.136.40:8077/cloudVod/payExecute?orderID={orderID}".format(
         #     SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
-
-        call_clc_url = "{SERVER_DOMAIN}cloudVod/cancleorder?orderID={orderID}". \
-            format(SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
+        call_clc_url = "{SERVER_DOMAIN}cloudVod/payError"
+        # call_clc_url = "{SERVER_DOMAIN}cloudVod/cancleorder?orderID={orderID}". \
+        #     format(SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
         paypalrestsdk.configure({
             "mode": "sandbox",  # sandbox or live
             "client_id": "AfnfDqezODOoWGS-W2Itu-Zl1ay1R95IsGlMqPghPA3KGhkPndNMnQT0bdEewvSv92XAFIfLiinmyhBL",

Controller/DeviceLog.py

@@ -50,7 +50,7 @@ def DeviceLog(request, uid):
                 print(repr(e))
                 return response.json(48,repr(e))
         else:
-            return response.json(13)
+            return response.json(173)
     # 查找设备日志
     if request.method == 'GET':
         request.encoding = 'utf-8'

Controller/EquipmentInfo.py

@@ -314,4 +314,4 @@ class DetectStatusView(View):
             return response.json(0, {'uid_token': uid_token,
                                      'push_url': '{SERVER_DOMAIN}detect/add'.format(SERVER_DOMAIN=SERVER_DOMAIN)})
         else:
-            return response.json(13)
+            return response.json(173)

Controller/EquipmentManager.py

@@ -73,7 +73,7 @@ def addNewUserEquipmentInterface(request):
             else:
                 UID = deviceData.get('UID', None)
                 if not UID:
-                    return response.json(806)
+                    return response.json(444,'content')
                 dValid = Device_Info.objects.filter(userID=userID, UID=UID)
                 if dValid:
                     return response.json(174)
@@ -99,7 +99,7 @@ def addNewUserEquipmentInterface(request):
                                                      **deviceData)
                             userDevice.save()
                     else:
-                        return response.json(180)
+                        return response.json(444,'UID')
 
         except Exception as e:
             errorInfo = traceback.format_exc()

Controller/EquipmentSensor.py

@@ -116,7 +116,7 @@ class EquipmentSensor(View):
                                                                                        'name': equipment_sensor.name,
                                                                                        'type': equipment_sensor.type})
                         else:
-                            return response.json(4)
+                            return response.json(178)
             else:
                 return response.json(14)
         return response.json(444)
@@ -165,7 +165,7 @@ class EquipmentSensor(View):
                     if is_update:
                         return response.json(0, {'id': id, 'status': status,
                                                                                            'name': name})
-                return response.json(4)
+                return response.json(178)
             else:
                 return response.json(14)
         else:

Controller/EquipmentStatus.py

@@ -39,7 +39,7 @@ def EquipmentOnline(request):
         UID = request.POST.get('UID', None)
     qs = Device_Info.objects.filter(UID=UID)
     if not qs.exists():
-        return response.json(13)
+        return response.json(173)
 
 
 
@@ -54,7 +54,7 @@ def EquipmentOffline(request):
         UID = request.POST.get('UID', None)
     qs = Device_Info.objects.filter(UID=UID)
     if not qs.exists():
-        return response.json(13)
+        return response.json(173)
     try:
         qs.update(Online=False)
     except Exception as e:
@@ -75,7 +75,7 @@ def updateIP(request):
     ip = request_dict.get('ip', None)
     qs = Device_Info.objects.filter(UID=UID)
     if not qs.exists():
-        return response.json(13)
+        return response.json(173)
     area = ''
     try:
         area = CommonService.getAddr(ip=ip)

Controller/OTAEquipment.py

@@ -56,9 +56,9 @@ def addNewEquipmentVersion(deviceContent, token, response):
                                 res = CommonService.qs_to_dict([equipmentVersion])
                                 return response.json(0, res)
                         else:
-                            return response.json(806)
+                            return response.json(444,'content')
                     else:
-                        return response.json(806)
+                        return response.json(444, 'content')
 
             else:
                 return response.json(404)

Controller/PermissionManager.py

@@ -110,10 +110,10 @@ class Roles(object):
         else:
             rid = roleContent.get('rid', None)
             if rid == None:
-                return response.json(806)
+                return response.json(444,'rid')
             try:
                 if rid in chain(Roles.rid):
-                    return response.json(807)
+                    return response.json(174)
 
                 permission_list = roleContent['permission']
                 roleContent.pop('permission')
@@ -122,7 +122,7 @@ class Roles(object):
                 if len(permission_list) > 0:
                     role.permission.add(*permission_list)
             except Exception as e:
-                return response.json(808, repr(e))
+                return response.json(178, repr(e))
             else:
                 self.startSignal()
                 return response.json(0)
@@ -130,35 +130,35 @@ class Roles(object):
     def delRoles(self, rid=None, rolename=None, response=ResponseObject()):
         if rid != None:
             if rid not in Roles.rid:
-                return response.json(190)
+                return response.json(173)
 
             try:
                 roletuple = Role.objects.filter(rid=rid).delete()
             except Exception as e:
-                return response.json(192, repr(e))
+                return response.json(176, repr(e))
             else:
                 if roletuple[0] == 1:
                     self.startSignal()
                     return self.queryAllRoles(response=response)
                 else:
-                    return response.json(193, {'error_msg': roletuple})
+                    return response.json(178, {'error_msg': roletuple})
         elif rolename != None:
             if rid not in Roles.rolename:
-                return response.json(191)
+                return response.json(173)
             try:
                 roletuple = Role.objects.filter(roleName=rolename).delete()
             except Exception as e:
-                return response.json(192)
+                return response.json(176)
             else:
                 if roletuple[0] == 1:
                     self.startSignal()
                     return self.queryAllRoles(response=response)
                 else:
-                    return response.json(193)
+                    return response.json(178)
 
     def modifyRoles(self, rid=None, content=None, response=ResponseObject()):
         if rid not in Roles.rid:
-            return response.json(190)
+            return response.json(173)
         try:
             roleContent = json.loads(content)
         except Exception as e:
@@ -176,14 +176,14 @@ class Roles(object):
                     else:
                         Role.objects.get(rid=rid).permission.clear()
             except Exception as e:
-                return response.json(194)
+                return response.json(177)
 
             else:
                 if roleCount == 1:
                     self.startSignal()
                     return self.queryAllRoles(response=response)
                 else:
-                    return response.json(195)
+                    return response.json(177)
 
 
 class Permission(object):
@@ -232,11 +232,11 @@ class Permission(object):
         else:
             return response.json(444, 'id,perm')
         if not perm:
-            return response.json(817)
+            return response.json(173)
         try:
             perm.delete()
         except Exception as e:
-            return response.json(818, repr(e))
+            return response.json(176, repr(e))
         else:
             self.startSignal()
             qs = Permissions.objects.all()
@@ -342,7 +342,7 @@ class addNewRoleView(View):
 
         rids = User[0].get_role_id()
         if rids == None:
-            return response.json(606)
+            return response.json(174)
         Aperms = False
         for rid in rids:
             if rid < 10:
@@ -428,7 +428,7 @@ class modifyRoleView(View):
         User = Device_User.objects.filter(userID=userID)
         rids = User[0].get_role_id()
         if rids == None:
-            return response.json(606)
+            return response.json(174)
         Aperms = False
         for rrid in rids:
             if rrid < 10:
@@ -482,7 +482,7 @@ class addNewPermsView(View):
                 perm = Permissions(**add_dict)
                 perm.save()
             except Exception as e:
-                return response.json(816, repr(e))
+                return response.json(178, repr(e))
             else:
                 return Permission.getAllPermission(response=response)
 
@@ -521,7 +521,7 @@ class delPermsView(View):
         User = Device_User.objects.filter(userID=userID)
         rids = User[0].get_role_id()
         if len(rids) == 0:
-            return response.json(606)
+            return response.json(174)
         Aperms = False
         for rid in rids:
             if rid < 10:
@@ -578,7 +578,7 @@ class queryPermsView(View):
         User = Device_User.objects.filter(userID=userID)
         rids = User[0].get_role_id()
         if len(rids) == 0:
-            return response.json(606)
+            return response.json(174)
         Aperms = False
         for rid in rids:
             if rid < 10:
@@ -629,7 +629,7 @@ class modifyPermsView(View):
         else:
             rids = User[0].get_role_id()
             if len(rids) == 0:
-                return response.json(606)
+                return response.json(174)
             Aperms = False
             for rid in rids:
                 if rid < 10:

Controller/UserController.py

@@ -339,7 +339,7 @@ class ChangePwdView(TemplateView):
         if update:
             return response.json(0)
         else:
-            return response.json(112)
+            return response.json(177)
 
 
 class ForgetPwdView(TemplateView):
@@ -388,7 +388,7 @@ class ForgetPwdView(TemplateView):
             if not User.exists():
                 User = Device_User.objects.filter(userEmail=userName)
         else:
-            return response.json(9)
+            return response.json(104)
         if User:
             email = User[0].userEmail
             userID = User[0].userID
@@ -416,7 +416,7 @@ class ForgetPwdView(TemplateView):
             else:
                 return response.json(103)
         else:
-            return response.json(9)
+            return response.json(104)
 
 
 class EmailResetPwdView(TemplateView):
@@ -461,7 +461,7 @@ class EmailResetPwdView(TemplateView):
                         else:
                             return response.json(10)
                     else:
-                        return response.json(9)
+                        return response.json(104)
                 else:
                     return HttpResponseRedirect('http://www.dvema.com/web/html/paw_update_unsuccessful.html?lang=en')
                     return response.json(306, 'rpwd')

Controller/UserManger.py

@@ -310,7 +310,7 @@ class setUserValidView(View):
             else:
                 return self.UserValidUpdatePC(superID, eUserID, isValid, rid, response)
         else:
-            return response.json(150)
+            return response.json(444,'superID or userID')
 
     def UserValidUpdatePC(self, superID, eUserID, isValid, rid, response):
         super = Device_User.objects.filter(userID=superID)
@@ -330,7 +330,7 @@ class setUserValidView(View):
             except Exception as e:
                 errorInfo = traceback.format_exc()
                 print('更新数据库错误:%s' % errorInfo)
-                return response.json(501, repr(e))
+                return response.json(177, repr(e))
             else:
                 return response.json(0)
         else:
@@ -350,7 +350,7 @@ class setUserValidView(View):
         except Exception as e:
             errorInfo = traceback.format_exc()
             print('更新数据库错误: %s' % errorInfo)
-            return response.json(501, repr(e))
+            return response.json(177, repr(e))
         return response.json(0)
 
 

Controller/shareUserPermission.py

@@ -226,7 +226,7 @@ class shareUserEquipmentView(View):
                         continue
 
         if len(querysetList) == 0:
-            return response.json(160, {'error_UID': UID})
+            return response.json(174, {'error_UID': UID})
         else:
             try:
                 Device_Info.objects.bulk_create(querysetList)
@@ -327,7 +327,7 @@ class unsharedUserEquipmentView(View):
                     else:
                         removeCount += equipmentCount[0]
                 if len(errorRemove) > 0:
-                    return response.json(171, {'removeCount': removeCount, 'error_UID': errorRemove})
+                    return response.json(176, {'removeCount': removeCount, 'error_UID': errorRemove})
                 else:
                     if len(errorUID) > 0:
                         return response.json(173, {'removeCount': removeCount, 'error_UID': errorUID})

Object/OssObject.py

@@ -1,35 +0,0 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2018/12/10 11:42
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: OssObject.py
-@Contact: chanjunkai@163.com
-"""
-import oss2
-from Ansjer.config import OSS_BUCKET_ENDPOINT, OSS_BUCKET_VOD_LIST, OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, \
-    OSS_REGION_ID, OSS_ROLE_ARN, SERVER_DOMAIN
-
-
-class OssObject:
-
-    def __init__(self):
-        self.auth = oss2.Auth(OSS_STS_ACCESS_KEY,OSS_STS_ACCESS_SECRET)
-
-    def getObjectList(self,prefix,bucket_name):
-        bucket = oss2.Bucket(self.auth, OSS_BUCKET_ENDPOINT, bucket_name)
-        vod_play_list = []
-        # for obj in oss2.ObjectIterator(bucket=bucket, prefix=prefix, delimiter='/', max_keys=2, marker=marker):
-        for obj in oss2.ObjectIterator(bucket=bucket, prefix=prefix, delimiter='/'):
-            # 通过is_prefix方法判断obj是否为文件夹。
-            if obj.is_prefix():  # 文件夹
-                print('directory: ' + obj.key)
-                vod_play_list.append(obj.key)
-            else:  # 文件
-                print('file: ' + obj.key)
-        return vod_play_list

Object/ResponseObject.py

@@ -13,17 +13,12 @@ class ResponseObject(object):
     def data(self, code, res={}):
         data_en = {
             0: 'Success',
-            4: 'Operation failed',
             5: 'Please try again one minute later！',
-            9: 'User accounts is not exist',
             10: res,
             12: 'You are not the primary user of the device!',
-            13: 'Device is not exist !',
             14: 'Device is not belong to you',
-            15: 'Not own service',
             44: 'System error! Can not send email',
             48: 'System object error!',
-            60: 'The app info has already exist',
             89: 'Already send the code, please check it or get it again after 10m',
             90: 'please check code or get it again after 5m',
             100: 'Phone format error！',
@@ -32,51 +27,27 @@ class ResponseObject(object):
             103: 'Mail already existed!',
             104: 'Account doesn\'t exist!',
             105: 'Email format error！',
-            106: 'Create User Error',
             107: 'The username not conform to the rules!',
             108: 'Email format error！',
             109: 'The password not conform to the rules!',
-            110: 'user is not activated',
+            110: 'user doesn\'t activated',
             111: 'Error password',
-            112: 'update password error!',
-            114: 'Delete user failure error',
-            118: 'You do not enter the password two times!',
             120: 'The code has expired',
             121: 'The verification code is wrong!',
-            150: 'Wrong superID is None or userID',
-            160: 'The All Equipment has been shared by the User!',
-            171: 'Delete Equipment sharing failed',
-            172: 'There is no Equipment for this User!',
-            173: 'The UID does not exist!',
-            174: 'The user equipment has already existed!',
-            175: 'The user equipment has already binding!',
-            176: 'Delete equipment error',
-            177: 'Update equipment error',
-            178: 'ADD equipment error',
-            179: 'Device nickname cannot be repeated',
-            180: 'UID specification error',
-            190: 'The rid does not exist!',
-            191: 'The roleName does not exist!',
-            192: 'Delete role error',
-            193: 'role can not be deleted!',
-            194: 'Update role error',
-            195: 'role can not be updated!',
+            173: 'Data does not exists!',
+            174: 'Data already exists!',
+            176: 'Delete error',
+            177: 'Update error',
+            178: 'ADD error',
+            179: 'Nickname repeated',
             306: 'The link has expired!',
             309: 'Please ReLogin! errmsg token',
-            403: 'API ERROR!',
             404: 'You don not have permission to access this!',
             414: 'Please confirm the request url!',
             424: 'Database Error !',
             444: 'Wrong parameters!',
             474: 'System Maintaining！',
             500: 'Query Database Error:',
-            501: 'Update database error!',
-            606: 'User has not assigned role!',
-            807: 'The role has already existed!',
-            808: 'Add a new role to the wrong',
-            816: 'Add a new permissions error',
-            817: 'The permissions do not exist!',
-            818: 'Delete permission failed',
             700: 'Upload file error',
             701: 'The file does not exist!',
             900: 'There is no information about this version!',
@@ -88,17 +59,12 @@ class ResponseObject(object):
         }
         data_cn = {
             0: '成功',
-            4: '操作失败',
             5: '请一分钟后再尝试',
-            9: '用户账号不存在',
             10: res,
             12: '您不是设备主用户',
-            13: '设备不存在',
             14: '设备不属于您',
-            15: '您尚未打开此服务',
             44: '系统错误！无法发送电子邮件',
             48: '系统对象错误',
-            60: 'APP信息已经存在',
             89: '已发验证码，请检测或10分钟后重新获取。',
             90: '请检测或5分钟后重新获取。',
             100: '手机格式错误！',
@@ -107,52 +73,27 @@ class ResponseObject(object):
             103: '邮箱已存在！',
             104: '账户不存在！',
             105: '邮箱格式错误！',
-            106: '创建用户错误',
             107: '用户名格式不符合！',
             108: '邮箱格式错误！',
             109: '密码格式不符合！',
             110: '用户未激活！',
-            111: '您输入的密码不正确！',
-            112: '未知错误不能更新密码！',
-            114: '删除用户失败错误',
-            118: '你不输入密码两次！',
+            111: '密码不正确！',
             120: '验证码过期',
             121: '验证码错了！',
-            150: '超级用户或用户id错误',
-            160: '所有设备已被用户共享！',
-            171: '删除设备共享失败',
-            172: '这个用户没有设备！',
-            173: '设备UID不存在！',
-            174: '用户设备已经存在！',
-            175: '用户设备已经绑定了！',
-            176: '删除设备错误',
-            177: '更新设备错误',
-            178: '添加设备错误',
-            179: '设备名称不能重复',
-            180: 'UID规格错误',
-            190: '角色rid不存在！',
-            191: '角色名不存在！',
-            192: '删除角色错误',
-            193: '未知的错误导致角色不能被删除！',
-            194: '更新角色错误',
-            195: '未知的错误导致角色无法更新！',
+            173: '数据不存在！',
+            174: '数据已存在！',
+            176: '删除错误',
+            177: '更新错误',
+            178: '增加错误',
+            179: '名称不能重复',
             306: '链接已超过有效期!',
             309: '请重新登录!',
-            403: 'API错误！',
             404: '您没有访问的权限！',
             414: '请确认请求url！',
             424: '数据库错误！',
             444: '参数错误！',
             474: '系统维护中！',
             500: '查询数据库错误！',
-            501: '更新数据库错误！',
-            606: '用户没有分配角色！',
-            616: '用户帐户不存在！',
-            807: '角色已经存在！',
-            808: '添加新角色错误',
-            816: '新增权限错误',
-            817: '权限不存在',
-            818: '删除权限错误',
             700: '上传文件错误',
             701: '文件不存在',
             900: '版本信息不存在',