reg

Ansjer/config.py

@@ -67,8 +67,6 @@ elif SERVER_TYPE == 'Ansjer.formal_settings':
     SERVER_HOST = 'localhost'
 
 # oss param
-OSS_BUCKET_VOD_LIST = {1: 'cloudvod1', 2: 'cloudvod2', 3: 'cloudvod3'}
-OSS_BUCKET_ENDPOINT = ''
 OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
 OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
 OSS_REGION_ID = 'cn-shenzhen'

Controller/VodBucket.py

@@ -11,28 +11,16 @@
 @file: VodBucket.py
 @Contact: chanjunkai@163.com
 """
-import datetime
 import json
 import time
 
-import oss2
-import paypalrestsdk
-from aliyunsdkcore import client
-from aliyunsdksts.request.v20150401 import AssumeRoleRequest
-from django.http import JsonResponse
-from django.utils import timezone
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
-import urllib
-from var_dump import var_dump
-from Ansjer.config import OSS_BUCKET_ENDPOINT, OSS_BUCKET_VOD_LIST, OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, \
-    OSS_REGION_ID, OSS_ROLE_ARN, SERVER_DOMAIN
-from Model.models import Device_Meal, Device_Info, Order_Model, Store_Meal, VodHlsModel, OssCrdModel, VodBucketModel
+
+from Model.models import VodBucketModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from Object.UidTokenObject import UidTokenObject
-from Service.CommonService import CommonService
 from Service.ModelService import ModelService
 
 

Model/models.py

@@ -462,6 +462,7 @@ class VodBucketModel(models.Model):
     content = models.TextField(verbose_name='描述')
     endpoint = models.CharField(max_length=125,default='', verbose_name='存储节点')
     area = models.CharField(max_length=16,default='', verbose_name='区域')
+    region = models.CharField(max_length=16,default='', verbose_name='regionID')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)