|
@@ -432,22 +432,18 @@ class CloudStorageView(View):
|
|
|
endTime = int(request_dict.get('endTime', None))
|
|
|
uid = request_dict.get('uid', None)
|
|
|
channel = request_dict.get('channel', None)
|
|
|
+
|
|
|
+ print('开始时间--%d' %(time.time()*1000))
|
|
|
dv_qs = Device_Info.objects.filter(UID=uid, userID_id=userID, isShare=False)
|
|
|
if not dv_qs.exists():
|
|
|
return response.json(12)
|
|
|
now_time = int(time.time())
|
|
|
|
|
|
- print('----------now_time')
|
|
|
- print(now_time)
|
|
|
-
|
|
|
vh_qs = VodHlsModel.objects.filter\
|
|
|
- (uid=uid, channel=channel, time__range=(startTime, endTime), endTime__gte=now_time). \
|
|
|
+ ( uid=uid, channel=channel, time__range=(startTime, endTime), endTime__gte=now_time). \
|
|
|
values("time", "sec", "bucket__bucket", "bucket__endpoint", "bucket__region", "bucket__mold")
|
|
|
vod_play_list = []
|
|
|
- print("-------------vh_qs")
|
|
|
- print(vh_qs)
|
|
|
auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
|
|
|
- print('--------------bigin')
|
|
|
print(int(time.time()))
|
|
|
for vod in vh_qs:
|
|
|
bucket__mold = vod["bucket__mold"]
|
|
@@ -497,8 +493,7 @@ class CloudStorageView(View):
|
|
|
'sign_url': vod_url,
|
|
|
# 'thumb': thumb_url,
|
|
|
'sec': vod['sec']})
|
|
|
- print('--------------end')
|
|
|
- print(int(time.time()))
|
|
|
+ print('结束时间--%d' %(time.time()*1000))
|
|
|
return response.json(0, vod_play_list)
|
|
|
|
|
|
def do_store_playlist(self, request_dict, response):
|