vod hls更名

Ansjer/test/osssigput.py

@@ -25,7 +25,7 @@ http://test.dvema.com/cloudVod/getSts?uidToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1N
 '''
 
 
-tokenss = {"code": 0, "AccessKeySecret": "A1TLLTq834TEUXT7pDckQvArstq3nwfTHLqG4xBvghFJ", "bucket_name": "cloudvod1", "expire": "3600", "AccessKeyId": "STS.NH8o6YfLNTGs8s75UMCs4ENj5", "ip": "120.237.157.184", "Expiration": "2018-12-14T09:59:17Z", "SecurityToken": "CAIS9wJ1q6Ft5B2yfSjIr4uNJIzti5Nv44WYOlWG0VUYT/wYqovB1zz2IHFIf3NhAe0bv/kzm2lX7/YYlr1dd6RhYRzkSJcrsaYMoTycOtOYkpQYWEuNGtn3d1KIAjvXgeV9CoeQFaF0E5XAQlTAkTAJkNmeXD6+XlujHISUgJp8FLo+VRW5ajw0TbUzIRB5+vcHKVzbN/umLnyShXHLXmZlvgdghER166m03re7iHzkgUb91/UeqqnoP5GgdLMMBppkVMqv1+EELciY2SVLuR9R7/U03u4W8jPAo92DBFUIpDu6CM7wov1KcFQmVPNqJJMd9aHV0uN/trCU1f6zqXdsJchZXz7SX5vapMLPA7GSMcsjfrvaIwa0sLfWbMGz6Vh7JytGa0UTK4YDUiYhUUV3FmuFe/X7pA6WO1uZJvLbgP1s4/1c1E71+NeGHV+LToiC3DwQUp1GNBJ0bERHhTG8I/JaLFUTKgM9HdiOUZ50dwtODyh1OMgSjkYagAFVlqu9K9oeqNWbBQbdYnGje20BzSjGcKaQ9+keYW4ErhfGpcK/hTZemX4CmtvYeqBnNgo/Qwhm1WeI9E+jdq2Sk390yqTw0scFuNhyhiimU2+HwIgkUNUvgOALvZLklpoaXMTrgANicuTPO5JYXSGj6YgvdoCX8ejHdHCMfA12aQ==", "endpoint": "oss-cn-shenzhen.aliyuncs.com", "storage": "FTSLL8HM437Z38WU111A/vod4/", "arn": "acs:ram::1901342792446414:role/stsoss/FTSLL8HM437Z38WU111A"}
+tokenss = {"AccessKeyId": "STS.NK6n7GFc55gqJ9Hu7hy3P2oxy", "AccessKeySecret": "EeZv5ENCBWajkXPeEAx3t6xXiC5TdcmaoYzn2j9rLmpQ", "SecurityToken": "CAISyQJ1q6Ft5B2yfSjIr4iDJY3zq7wUgqWaSB/5kTc9dbx83arTmzz2IHFIf3NhAe0bv/kzm2lX7/YYlr1dd6RhYRzkSJcrsaYMoTycOtOYkpQvYT+wG9n3d1KIAjvXgeUjCoeQFaEmE5XAQlTAkTAJkNmeXD6+XlujHISUgJp8FLo+VRW5ajw0TbUzIRB5+vcHKVzbN/umLnyShXHLXmZlvgdghER166m03re7iHzkgUb91/UeqqnoP5GgdLMMBppkVMqv1+EELciY2SVLuR9R7/U03u4W8jPAo92DBFUIpDu6CM7wov1KcFQmVPNqJJMd9aHV0uN/trWU1aaPkkcVZLoJCXuOHtz8npedRNnEbIhpKezJXF3Wyc2KO5XPtAcpXGkWLgsieaB6eyMrU010F2yLd/P4oQ+TMl25JbOZy6YtyorTRMhtOBpSTBqAAQIxOD8vVeHfRET47Fo8F08EEoMRJ8C+1tiTiPoF4Mn3pr36oF85tlcCN755ZLLtB/JR+cwQWEnetO12XU5kXw5r1XT9lDbtnQjt4TojHN70zSFghOT/QuIDTT+y5BTH7S6n30EUnXtwm3RHE4J7foo6a/VJ0qZRmjSQpV5pdHQr", "Expiration": "2018-12-17T09:59:13Z", "expire": "3600", "endpoint": "oss-cn-shenzhen.aliyuncs.com", "bucket_name": "cloudvod1", "arn": "acs:ram::1901342792446414:role/stsoss/FTSLL8HM437Z38WU111A", "code": 0, "storage": "FTSLL8HM437Z38WU111A/vod1/", "ip": "192.168.136.40"}
 # 使用RAM账号的AccessKeyId和AccessKeySecret向STS申请临时token。
 
 # 使用临时token中的认证信息初始化StsAuth实例。
@@ -54,9 +54,10 @@ bucket = oss2.Bucket(auth, tokenss['endpoint'], tokenss['bucket_name'])
 # # 上传一个字符串。
 # bucket.delete_object('a-3.txt')
 # exit()
-
-# bucket.put_object('5ZBU8UD6RHMZJ5JW111A/vod2/3agjj.txt', b'gjjs')
-bucket.put_object('FTSLL8HM437Z38WU111A/vod4/1234.txt', b'12345646',headers)
+patht=tokenss['storage']+'xxx.1234'
+print(patht)
+bucket.put_object(patht, b'gj1js')
+# bucket.put_object('FTSLL8HM437Z38WU111A/vod4/1234.txt', b'12345646',headers)
 exit()
 res = bucket.get_object('1234.txt')
 print(res.read())

Controller/CloudVod.py

@@ -26,7 +26,7 @@ from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
 import urllib
 
-from Ansjer.config import OSS_BUCKET_ENDPOINT, OSS_BUCKET_VOD_LIST, OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, \
+from Ansjer.config import OSS_BUCKET_ENDPOINT, 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
 from Object.ResponseObject import ResponseObject
@@ -131,14 +131,15 @@ class CloudVodView(View):
         uid = qs[0]['UID']
         nowTime = int(time.time())
         orderID = CommonService.createID()
-        smqs = Store_Meal.objects.filter(id=rank).values("currency", "price")
+        smqs = Store_Meal.objects.filter(id=rank).values("currency", "price", "content")
         currency = smqs[0]['currency']
         price = smqs[0]['price']
+        content = smqs[0]['content']
         call_sub_url = "{SERVER_DOMAIN}cloudVod/payExecute?orderID={orderID}".format(SERVER_DOMAIN=SERVER_DOMAIN,
                                                                                      orderID=orderID)
         # call_sub_url = "http://192.168.136.40:8077/cloudVod/payExecute?orderID={orderID}".format(
         #     SERVER_DOMAIN=SERVER_DOMAIN, orderID=orderID)
-        call_clc_url = "http://192.168.136.40:8077/cloudVod/order/cancle"
+        call_clc_url = "http://192.168.136.40:8077/cloudVod/cancleorder"
         paypalrestsdk.configure({
             "mode": "sandbox",  # sandbox or live
             "client_id": "AfnfDqezODOoWGS-W2Itu-Zl1ay1R95IsGlMqPghPA3KGhkPndNMnQT0bdEewvSv92XAFIfLiinmyhBL",
@@ -152,12 +153,11 @@ class CloudVodView(View):
                 "item_list": {
                     "items": [{"name": "Cloud video", "sku": "1", "price": price, "currency": "USD", "quantity": 1}]},
                 "amount": {"total": price, "currency": currency},
-                "description": "7 days mobile detection storage event 1 month charge"
+                "description":content
             }]})
 
         if payment.create():
             print("Payment created successfully")
-
         else:
             print(payment.error)
             return response.json(10, payment.error)

Controller/OrderContrller.py

@@ -69,9 +69,9 @@ class OrderView(View):
         omqs = Order_Model.objects.filter(userID_id=userID)
         if not omqs.exists():
             return response.json(10, '订单不存在')
-        res = {"count": omqs.count()}
+        count= omqs.count()
         order_ql = omqs[(page - 1) * line:page * line].values("orderID", "UID", "channel", "desc", "price", "addTime",
                                                               "updTime", "paypal", "rank__day", "rank__price",
                                                               "rank__content", "rank__title")
-        res["data"] = list(order_ql)
-        return response.json(0, res)
+        data = list(order_ql)
+        return response.json(0, {'data':data,'count':count})

Model/models.py

@@ -605,7 +605,7 @@ class VodHlsModel(models.Model):
         return self.id
 
     class Meta:
-        db_table = 'vodhls'
+        db_table = 'vod_hls'
         verbose_name = u'云存回放信息表'
         verbose_name_plural = verbose_name
         ordering = ('-id',)