|
|
@@ -121,13 +121,13 @@ class testView(View):
|
|
|
if not dv_qs.exists():
|
|
|
return response.json(12)
|
|
|
vod_play_list = []
|
|
|
- bucket_name = 'awsusvod1'
|
|
|
+ bucket_name = 'azvod1'
|
|
|
aws_access_key_id = 'AKIA2E67UIMD45Y3HL53'
|
|
|
aws_secret_access_key = 'ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw'
|
|
|
session = Session(
|
|
|
aws_access_key_id=aws_access_key_id,
|
|
|
aws_secret_access_key=aws_secret_access_key,
|
|
|
- region_name='us-west-1'
|
|
|
+ region_name='ap-northeast-1'
|
|
|
)
|
|
|
conn = session.client('s3')
|
|
|
thumbspng = '{uid}/vod{channel}/{time}/thumbs.png'. \
|
|
|
@@ -143,7 +143,7 @@ class testView(View):
|
|
|
# m3u8 = '{uid}/vod{channel}/{time}/{time}.m3u8'. \
|
|
|
# format(uid=uid, channel=channel, time=vod['time'])
|
|
|
thumb_url = response_url
|
|
|
- vod_url = 'http://{ip}:8000/testApi/signplaym3u8?' \
|
|
|
+ vod_url = 'http://13.56.215.252:8077/testApi/signplaym3u8?' \
|
|
|
'uid={uid}&channel={channel}&time={time}&sign=tktktktk'. \
|
|
|
format(ip=ip, uid=uid, channel=channel, time=1590485548)
|
|
|
vod_play_list.append({
|
|
|
@@ -159,8 +159,8 @@ class testView(View):
|
|
|
storeTime = 1590485548
|
|
|
sec = 11
|
|
|
fg = 3
|
|
|
- bucket__region = 'us-west-1'
|
|
|
- bucket_name = 'awsusvod1'
|
|
|
+ bucket__region = 'ap-northeast-1'
|
|
|
+ bucket_name = 'azvod1'
|
|
|
aws_access_key_id = 'AKIA2E67UIMD45Y3HL53'
|
|
|
aws_secret_access_key = 'ckYLg4Lo9ZXJIcJEAKkzf2rWvs8Xth1FCjqiAqUw'
|
|
|
session = Session(
|
|
|
@@ -566,8 +566,10 @@ class testView(View):
|
|
|
if not ubqs.exists():
|
|
|
return response.json(10, '设备未购买')
|
|
|
nowTime = int(time.time())
|
|
|
- vodqs = VodHlsModel.objects.filter(uid=uid, channel=channel, time__range=(startTime, endTime),
|
|
|
- endTime__gte=nowTime) \
|
|
|
+ # vodqs = VodHlsModel.objects.filter(uid=uid, channel=channel, time__range=(startTime, endTime),
|
|
|
+ # endTime__gte=nowTime) \
|
|
|
+ # .values("time", "sec", "bucket__bucket", "bucket__endpoint", "bucket__region")
|
|
|
+ vodqs = VodHlsModel.objects.filter(uid=uid, channel=channel) \
|
|
|
.values("time", "sec", "bucket__bucket", "bucket__endpoint", "bucket__region")
|
|
|
vod_play_list = []
|
|
|
print(vodqs)
|
lang