|
@@ -13,7 +13,8 @@ from itertools import groupby
|
|
from operator import itemgetter
|
|
from operator import itemgetter
|
|
from packaging import version
|
|
from packaging import version
|
|
from urllib.parse import quote, parse_qs, unquote
|
|
from urllib.parse import quote, parse_qs, unquote
|
|
-
|
|
|
|
|
|
+from aliyunsdkcore import client
|
|
|
|
+from aliyunsdkcore.request import CommonRequest
|
|
import boto3
|
|
import boto3
|
|
import jwt
|
|
import jwt
|
|
import paypalrestsdk
|
|
import paypalrestsdk
|
|
@@ -25,7 +26,7 @@ from django.views.generic.base import View
|
|
from AdminController.CloudServiceManage.AgentOrderController import AgentOrderView
|
|
from AdminController.CloudServiceManage.AgentOrderController import AgentOrderView
|
|
from Ansjer.config import SERVER_DOMAIN, PAYPAL_CRD, SERVER_DOMAIN_SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, \
|
|
from Ansjer.config import SERVER_DOMAIN, PAYPAL_CRD, SERVER_DOMAIN_SSL, AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, \
|
|
AWS_ARN, OAUTH_ACCESS_TOKEN_SECRET, DETECT_PUSH_DOMAINS, CONFIG_INFO, CONFIG_CN, BINOCULAR_DEVICE_TYPE, CONFIG_US, \
|
|
AWS_ARN, OAUTH_ACCESS_TOKEN_SECRET, DETECT_PUSH_DOMAINS, CONFIG_INFO, CONFIG_CN, BINOCULAR_DEVICE_TYPE, CONFIG_US, \
|
|
- CONFIG_TEST, CONFIG_EUR
|
|
|
|
|
|
+ CONFIG_TEST, CONFIG_EUR, OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN
|
|
from Controller.CheckUserData import DataValid
|
|
from Controller.CheckUserData import DataValid
|
|
from Controller.CloudPhoto.CloudServiceController import CloudServiceController
|
|
from Controller.CloudPhoto.CloudServiceController import CloudServiceController
|
|
from Controller.PaymentCycle import Paypal
|
|
from Controller.PaymentCycle import Paypal
|
|
@@ -620,15 +621,10 @@ class CloudStorageView(View):
|
|
channel = request_dict.get('channel', None)
|
|
channel = request_dict.get('channel', None)
|
|
|
|
|
|
if not all([uid, channel]):
|
|
if not all([uid, channel]):
|
|
- return response.json(444, 'uidToken')
|
|
|
|
|
|
+ return response.json(444)
|
|
|
|
|
|
try:
|
|
try:
|
|
# 阿里云 oss sts
|
|
# 阿里云 oss sts
|
|
- from aliyunsdkcore import client
|
|
|
|
- from aliyunsdkcore.request import CommonRequest
|
|
|
|
- import json
|
|
|
|
- from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, OSS_ROLE_ARN
|
|
|
|
-
|
|
|
|
storage = '{uid}/vod{channel}/'.format(uid=uid, channel=channel)
|
|
storage = '{uid}/vod{channel}/'.format(uid=uid, channel=channel)
|
|
bucket_name = 'asj-test-1' # 存储桶名称
|
|
bucket_name = 'asj-test-1' # 存储桶名称
|
|
endpoint = 'oss-cn-shenzhen.aliyuncs.com' # OSS endpoint
|
|
endpoint = 'oss-cn-shenzhen.aliyuncs.com' # OSS endpoint
|