Browse Source

修复云存分表问题

peng 2 years ago
parent
commit
a9893b4e88
3 changed files with 3 additions and 3 deletions
  1. 1 1
      Controller/CloudStorage.py
  2. 1 1
      Object/TokenObject.py
  3. 1 1
      Service/VodHlsService.py

+ 1 - 1
Controller/CloudStorage.py

@@ -1713,7 +1713,7 @@ class CloudStorageView(View):
                 'vod_count': vod['count'],
                 'date_format': vod['date'],
             })
-        had_vod_list = sorted(had_vod_list, key=lambda item: -item['timestamp'])
+        had_vod_list = sorted(had_vod_list, key=lambda item: -item['timestamp'])[:31]
         return response.json(0, had_vod_list)
 
     @staticmethod

+ 1 - 1
Object/TokenObject.py

@@ -109,7 +109,7 @@ class TokenObject:
             access_token = jwt.encode(access_data,
                                       OAUTH_ACCESS_TOKEN_SECRET,
                                       algorithm='HS256')
-            return access_token.decode('utf-8')
+            return access_token
         except Exception as e:
             self.code = 309
             print(repr(e))

+ 1 - 1
Service/VodHlsService.py

@@ -102,5 +102,5 @@ class SplitVodHlsObject:
         vod_hls_sun = VodHlsSun.objects.extra(select={'date': "FROM_UNIXTIME(start_time,'%%Y-%%m-%%d')"}).values(
              'date').filter(**kwargs).annotate(count=Count('start_time')).order_by('-date')
 
-        vod_hls = vod_hls_mon.union(vod_hls_tus, vod_hls_wed, vod_hls_thur, vod_hls_fri, vod_hls_sat, vod_hls_sun)[:31]
+        vod_hls = vod_hls_mon.union(vod_hls_tus, vod_hls_wed, vod_hls_thur, vod_hls_fri, vod_hls_sat, vod_hls_sun)
         return vod_hls