|
|
@@ -249,7 +249,7 @@ class CloudVodView(View):
|
|
|
"Resource": [Resource_access],
|
|
|
"Effect": "Allow",
|
|
|
"Condition": {
|
|
|
- "IpAddress": {"acs:SourceIp": ip}
|
|
|
+ # "IpAddress": {"acs:SourceIp": ip}
|
|
|
# "IpAddress": {"acs:SourceIp": "120.237.157.184"}
|
|
|
# "IpAddress": {"acs:SourceIp": "*"}
|
|
|
}
|
|
|
@@ -294,8 +294,8 @@ class CloudVodView(View):
|
|
|
if not qs.exists():
|
|
|
return response.json(13)
|
|
|
uid = qs[0]['UID']
|
|
|
- dm_qs = Device_Meal.objects.filter(uid=uid, channel=channel).values('rank__bucket__bucket', 'end_time',
|
|
|
- 'rank__bucket__endpoint')
|
|
|
+ dm_qs = Device_Meal.objects.filter(uid=uid, channel=channel)\
|
|
|
+ .values('rank__bucket__bucket', 'end_time','rank__bucket__endpoint')
|
|
|
if not dm_qs.exists():
|
|
|
return response.json(10,'未购买')
|
|
|
now_time = timezone.localtime(timezone.now())
|
|
|
@@ -324,7 +324,7 @@ class CloudVodView(View):
|
|
|
thumb_key = '{prefix}ts0.ts'.format(prefix=obj.key)
|
|
|
print(thumb_key)
|
|
|
thumb = bucket.sign_url('GET',thumb_key , 3600,
|
|
|
- params={'x-oss-process': 'video/snapshot,t_10000,m_fast,w_300'})
|
|
|
+ params={'x-oss-process': 'video/snapshot,t_10000,m_fast,w_1'})
|
|
|
vod_play_list.append({'name': ptime, 'sign_url': vod_play_url,'thumb':thumb})
|
|
|
else: # 文件
|
|
|
pass
|
chenjunkai