makemigrations

Controller/CloudVod.py

@@ -105,7 +105,7 @@ class CloudVodView(View):
             if operation == 'getHlsList':
                 return self.do_get_playlist(request_dict, userID, response)
 
-                # return self.do_get_hls_list(request_dict, userID, response)
+                return self.do_get_hls_list(request_dict, userID, response)
             elif operation == 'createOrder':
                 return self.do_create_order(request_dict, userID, response)
             elif operation == 'status':
@@ -460,7 +460,7 @@ class CloudVodView(View):
                 print(thumb_key)
                 thumb = bucket.sign_url('GET', thumb_key, 3600,
                                         params={'x-oss-process': 'video/snapshot,t_10000,m_fast,w_300'})
-                vod_play_list.append({'name': ptime, 'sign_url': vod_play_url, 'thumb': thumb})
+                vod_play_list.append({'name': ptime, 'sign_url': vod_play_url, 'thumb': thumb,'sec':0})
             else:  # 文件
                 pass
                 # print('file: ' + obj.key)

Model/models.py

@@ -81,18 +81,18 @@ class Permissions(models.Model):
 
 
 class Role(models.Model):
-    ROLE_TYPES = (
-        ('Guests', u'Guests'),
-        ('Users', u'Users'),
-        ('Admins', u'Admins'),
-        ('SysAdmins', u'SysAdmins'),
-        ('LOGAdmins', u'LOGAdmins'),
-        ('OTAAdmins', u'OTAAdmins'),
-        ('DBAAdmins', u'DBAAdmins'),
-        ('SuperAdmins', u'SuperAdmins'),
-    )
+    # ROLE_TYPES = (
+    #     ('Guests', u'Guests'),
+    #     ('Users', u'Users'),
+    #     ('Admins', u'Admins'),
+    #     ('SysAdmins', u'SysAdmins'),
+    #     ('LOGAdmins', u'LOGAdmins'),
+    #     ('OTAAdmins', u'OTAAdmins'),
+    #     ('DBAAdmins', u'DBAAdmins'),
+    #     ('SuperAdmins', u'SuperAdmins'),
+    # )
     rid = models.SmallIntegerField(primary_key=True, unique=True, verbose_name=u'用户角色组ID')
-    roleName = models.CharField(max_length=32, choices=ROLE_TYPES, unique=True,
+    roleName = models.CharField(max_length=32,unique=True,
                                 default='User', verbose_name=u'角色名称')
     permission = models.ManyToManyField(to='Permissions', blank=True, verbose_name=u'权限', db_table='role_permissions')
     Description = models.TextField(blank=True, default='', verbose_name=u'描述信息')
@@ -111,33 +111,33 @@ class Role(models.Model):
     def natural_key(self):
         return (self.roleName,)
 
-    def has_perm(self, permission, obj=None):
-        if self.rid == 100:
-            return True
-
-        permlist = self.permission.all()
-        for perm in permlist:
-            if perm.permName == permission:
-                return True
-
-        return False
-
-    def get_all_perms_id(self):
-        perms = self.permission.all()
-        permslist = []
-        if self.rid == 100:
-            perms = Permissions.objects.all()
-            for perm in perms:
-                permslist.append(perm.id)
-            return permslist
-        else:
-            permlist_tmp = []
-            for perm in perms:
-                permlist_tmp.append(perm.id)
-            permSet = set(permlist_tmp)
-            permslist = list(permSet)
-            permslist.sort()
-            return permslist
+    # def has_perm(self, permission, obj=None):
+    #     if self.rid == 100:
+    #         return True
+    #
+    #     permlist = self.permission.all()
+    #     for perm in permlist:
+    #         if perm.permName == permission:
+    #             return True
+    #
+    #     return False
+
+    # def get_all_perms_id(self):
+    #     perms = self.permission.all()
+    #     permslist = []
+    #     if self.rid == 100:
+    #         perms = Permissions.objects.all()
+    #         for perm in perms:
+    #             permslist.append(perm.id)
+    #         return permslist
+    #     else:
+    #         permlist_tmp = []
+    #         for perm in perms:
+    #             permlist_tmp.append(perm.id)
+    #         permSet = set(permlist_tmp)
+    #         permslist = list(permSet)
+    #         permslist.sort()
+    #         return permslist
 
     def get_all_permission(self):
         perms = self.permission.all()
@@ -213,51 +213,51 @@ class Device_User(AbstractBaseUser):
             rids.append(role.rid)
         return rids
 
-    def has_perm(self, permission, obj=None):
-        roles = self.role.all()
-        for role in roles:
-            if role.rid == 100:
-                return True
-
-        permlist = self.permission.all()
-        for perm in permlist:
-            if perm.permName == permission:
-                return True
-
-        for role in roles:
-            permlist = role.permission.all()
-            for perm in permlist:
-                if perm.permName == permission:
-                    return True
-
-        return False
-
-    def get_all_perms_id(self):
-        roles = self.role.all()
-        perms = self.permission.all()
-
-        permslist = []
-        for role in roles:
-            if role.rid == 100:
-                perms = Permissions.objects.all()
-                for perm in perms:
-                    permslist.append(perm.id)
-                return permslist
-
-        for perm in perms:
-            permslist.append(perm.id)
-
-        permSet = set(permslist)
-        for role in roles:
-            permlist_tmp = []
-            for perm in role.permission.all():
-                permlist_tmp.append(perm.id)
-
-            permSet_tmp = set(permlist_tmp)
-            permSet = permSet.union(permSet_tmp)
-            permslist = list(permSet)
-            permslist.sort()
-            return permslist
+    # def has_perm(self, permission, obj=None):
+    #     roles = self.role.all()
+    #     for role in roles:
+    #         if role.rid == 100:
+    #             return True
+    #
+    #     permlist = self.permission.all()
+    #     for perm in permlist:
+    #         if perm.permName == permission:
+    #             return True
+    #
+    #     for role in roles:
+    #         permlist = role.permission.all()
+    #         for perm in permlist:
+    #             if perm.permName == permission:
+    #                 return True
+    #
+    #     return False
+
+    # def get_all_perms_id(self):
+    #     roles = self.role.all()
+    #     perms = self.permission.all()
+    #
+    #     permslist = []
+    #     for role in roles:
+    #         if role.rid == 100:
+    #             perms = Permissions.objects.all()
+    #             for perm in perms:
+    #                 permslist.append(perm.id)
+    #             return permslist
+    #
+    #     for perm in perms:
+    #         permslist.append(perm.id)
+    #
+    #     permSet = set(permslist)
+    #     for role in roles:
+    #         permlist_tmp = []
+    #         for perm in role.permission.all():
+    #             permlist_tmp.append(perm.id)
+    #
+    #         permSet_tmp = set(permlist_tmp)
+    #         permSet = permSet.union(permSet_tmp)
+    #         permslist = list(permSet)
+    #         permslist.sort()
+    #         return permslist
 
     def get_all_permission(self):
         roles = self.role.all()
@@ -286,8 +286,8 @@ class Device_User(AbstractBaseUser):
             permslist.sort()
             return permslist
 
-    def has_module_perms(self, app_label):
-        return True
+    # def has_module_perms(self, app_label):
+    #     return True
 
     @property
     def is_staff(self):