|
|
@@ -45,6 +45,7 @@ from Service.VodHlsService import SplitVodHlsObject
|
|
|
ssl._create_default_https_context = ssl._create_unverified_context
|
|
|
LOGGER = logging.getLogger('info')
|
|
|
|
|
|
+
|
|
|
# 设备信息添加
|
|
|
class CloudStorageView(View):
|
|
|
|
|
|
@@ -397,7 +398,7 @@ class CloudStorageView(View):
|
|
|
"Effect": "Allow",
|
|
|
"Action": "s3:*",
|
|
|
"Resource": ["{aws_arn}:::{bucket_name}/{uid_channel}*".
|
|
|
- format(aws_arn=aws_arn, bucket_name=bucket_name, uid_channel=storage)]
|
|
|
+ format(aws_arn=aws_arn, bucket_name=bucket_name, uid_channel=storage)]
|
|
|
}
|
|
|
]
|
|
|
}
|
|
|
@@ -546,7 +547,8 @@ class CloudStorageView(View):
|
|
|
tag_type_list = SplitVodHlsObject.query_tag_type_list(start_time, ids)
|
|
|
for vod in vod_hls_qs:
|
|
|
bucket_name = regroup_bucket_qs[vod['bucket_id']]['bucket']
|
|
|
- thumbs_png = '{uid}/vod{channel}/{time}/Thumb.jpeg'.format(uid=uid, channel=vod['channel'], time=vod['start_time'])
|
|
|
+ thumbs_png = '{uid}/vod{channel}/{time}/Thumb.jpeg'.format(uid=uid, channel=vod['channel'],
|
|
|
+ time=vod['start_time'])
|
|
|
response_url = s3_obj.generate_file_obj_url(bucket_name, thumbs_png)
|
|
|
vod_url = '{server_domain}cloudstorage/signplaym3u8?' \
|
|
|
'uid={uid}&channel={channel}&time={time}&sign=tktktktk'. \
|
