|
|
@@ -6,6 +6,7 @@ import json
|
|
|
import logging
|
|
|
import sys
|
|
|
import time
|
|
|
+import jwt
|
|
|
from decimal import Decimal
|
|
|
from itertools import groupby
|
|
|
from operator import itemgetter
|
|
|
@@ -19,7 +20,7 @@ from django.http import JsonResponse, HttpResponseRedirect, HttpResponse
|
|
|
from django.views.generic.base import View
|
|
|
|
|
|
from Ansjer.config import SERVER_DOMAIN, PAYPAL_CRD, SERVER_DOMAIN_SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, \
|
|
|
- AWS_ARN
|
|
|
+ AWS_ARN, OAUTH_ACCESS_TOKEN_SECRET
|
|
|
from Controller.CheckUserData import DataValid
|
|
|
from Controller.CloudPhoto.CloudServiceController import CloudServiceController
|
|
|
from Controller.PaymentCycle import Paypal
|
|
|
@@ -286,10 +287,7 @@ class CloudStorageView(View):
|
|
|
store_time = request_dict.get('time', None)
|
|
|
if not all([uid_token, channel, store_time]):
|
|
|
return response.json(444)
|
|
|
- uid_obj = UidTokenObject(uid_token)
|
|
|
- if uid_obj.flag is False:
|
|
|
- return response.json(444, 'uidToken')
|
|
|
- uid = uid_obj.UID
|
|
|
+ uid = jwt.decode(uid_token, OAUTH_ACCESS_TOKEN_SECRET, algorithms='HS256').get('uid', '')
|
|
|
now_time = int(time.time())
|
|
|
vod_hls_qs = VodHlsModel.objects.filter(uid=uid, channel=channel, time=store_time,
|
|
|
endTime__gte=now_time).values("sec", "fg", "bucket__bucket",
|
