bucketID BUG fix

Ansjer/test/osssigput.py

@@ -25,7 +25,19 @@ http://test.dvema.com/cloudVod/getSts?uidToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1N
 '''
 
 
-tokenss = {"AccessKeySecret": "3Wpq6nBS5SDbwjRCM2vHcUeQuYZM4E1ZdiVR2QCPvMsC", "arn": "acs:ram::1901342792446414:role/stsoss/5ZBU8UD6RHMZJ5JW111A", "storage": "5ZBU8UD6RHMZJ5JW111A/vod1/", "AccessKeyId": "STS.NJV2583kSwpvhGYi1wAFGEEEu", "Expiration": "2018-12-20T10:37:50Z", "code": 0, "SecurityToken": "CAISxgJ1q6Ft5B2yfSjIr4njeY+M3rRywLKdamHojTEiTclrqoDulzz2IHFIf3NhAe0bv/kzm2lX7/YYlr0uebV4FXHoM/FQy6Z1rCGeOtOYkpR0QRG1HNn3d1KIAjvXgeUsCoeQFaElE5XAQlTAkTAJkNmeXD6+XlujHISUgJp8FLo+VRW5ajw0TbUzIRB5+vcHKVzbN/umLnyShXHLXmZlvgdghER166m03re4iHzkgUb91/UeqqnoP5GgdLMMBppkVMqv1+EELsiH2SVLuR9R7/U03u4W8jHZud3ERARjySjWDsaKyP1KHi0kRJdjQvdt6+b7maQ/+M6rztWvkk0RZ74ECXiDGtz5nPGpQr35aowLEp/gIGnI39y1MZ34jhgpe3pzNnkRKoZ6cC4oVEF9F22Fc/D+qArQDBy/UK+ey7GQWgfwCpUwlhqAASz5dxIFNLCHfvMKll1RajwEHpPLiIMX68sMill8JpRXqqvLuGaykQEL2GS3IT4vuuT4EpEQMGivajMr3+nL8668+h45zqS/0GojNUfT9v+Mbc0UNMSmndsnEyn3YFPVA6Cg8+aCOtVDhhyTs2Hep4PfrTTUZHT7u2W2X5KiiQZ0", "ip": "120.237.157.184", "bucket_name": "cnvod1", "expire": "3600", "endpoint": "oss-cn-shenzhen.aliyuncs.com"}
+tokenss = {
+  "Expiration": "2019-01-02T07:03:19Z",
+  "code": 0,
+  "SecurityToken": "CAISxgJ1q6Ft5B2yfSjIr4n7L+/V2KVS9IqvU3DUt1UeZeBqpYnOrjz2IHFIf3NhAe0bv/kzm2lX7/YYlr0uebV4FXHoM/FQy6Z1rCGeOtOYkpR9SyqGYNj3d1KIAjvXgeUsCoeQFaElE5XAQlTAkTAJkNmeXD6+XlujHISUgJp8FLo+VRW5ajw0TbUzIRB5+vcHKVzbN/umLnyShXHLXmZlvgdghER166m03re4iHzkgUb91/UeqqnoP5GgdLMMBppkVMqv1+EELsiH2SVLuR9R7/U03u4W8jHZud3ERARjySjWDsaKyP1KHi0kRJdjQvdt6+b7mac/+M6rztWvkk0RZ74ECXiDGtz5nPGpQr35aowLEp/gIGnI39y1MZ34jhgpe3pzNnkRKoZ6cC4oVEF9F22Fc/D+qArQDBy/UK+ey7GQWgfwCpUwlhqAAS0lC1SNhWzeK59LV7ZO52lDC871TSZp+LHohSB/zWC4ItNZ4Goq/kcrTLw0m92zHVp4ZI294+/J8FcHVm0JWHi0VkL0O8LUTmKFveAxKBRMzgS/z6LApFOgI6JCTgPvEI+rDf4aXAMsGn8xwuvJ9H+o7bHTVYV+NYQEmnl53Leb",
+  "AccessKeySecret": "41ZvKvrSLyKFzPMpZvFrFJdjzbrfqfysQn16Y62F4oxt",
+  "endpoint": "oss-cn-shenzhen.aliyuncs.com",
+  "storage": "5ZBU8UD6RHMZJ5JW111A/vod2/",
+  "expire": "3600",
+  "ip": "120.237.157.184",
+  "AccessKeyId": "STS.NJNdUa5zsCHDQVeSUKioFJLeL",
+  "bucket_name": "cnvod1",
+  "arn": "acs:ram::1901342792446414:role/stsoss/5ZBU8UD6RHMZJ5JW111A"
+}
 # 使用RAM账号的AccessKeyId和AccessKeySecret向STS申请临时token。
 
 # 使用临时token中的认证信息初始化StsAuth实例。
@@ -55,10 +67,10 @@ bucket = oss2.Bucket(auth, tokenss['endpoint'], tokenss['bucket_name'])
 # # 上传一个字符串。
 # bucket.delete_object('a-3.txt')
 # exit()
-patht=tokenss['storage']+'asdfasdfdsa.1234'
+patht=tokenss['storage']+'gsafd'
 print(patht)
 print(endpoint)
-bucket.put_object(patht, b'safasdfasdgg')
+bucket.put_object(patht, b'asdf')
 # bucket.put_object('FTSLL8HM437Z38WU111A/vod4/1234.txt', b'12345646',headers)
 exit()
 res = bucket.get_object('1234.txt')

Controller/CloudVod.py

@@ -473,7 +473,7 @@ class CloudVodView(View):
         if not paymentId or not PayerID or not orderID:
             red_url = "{SERVER_DOMAIN}cloudVod/payError".format(SERVER_DOMAIN=SERVER_DOMAIN)
             return HttpResponseRedirect(red_url)
-            return response.json(444, 'paymentId,PayerID,orderID')
+            # return response.json(444, 'paymentId,PayerID,orderID')
         paypalrestsdk.configure({
             "mode": "sandbox",  # sandbox or live
             "client_id": "AfnfDqezODOoWGS-W2Itu-Zl1ay1R95IsGlMqPghPA3KGhkPndNMnQT0bdEewvSv92XAFIfLiinmyhBL",
@@ -486,8 +486,8 @@ class CloudVodView(View):
         if not payres:
             red_url = "{SERVER_DOMAIN}cloudVod/payError".format(SERVER_DOMAIN=SERVER_DOMAIN)
             return HttpResponseRedirect(red_url)
-            print(payment.error)  # Error Hash
-            return response.json(10, payment.error)
+            # print(payment.error)  # Error Hash
+            # return response.json(10, payment.error)
         print("Payment execute successfully")
         order_qs = Order_Model.objects.filter(orderID=orderID)
         order_qs.update(status=1, updTime=CommonService.get_utc())
@@ -514,14 +514,15 @@ class CloudVodView(View):
                     if ubqs[0]['bucket__storeDay'] > smqs[0]['bucket__storeDay']:
                         return response.json(10, '不可降级')
                     else:
+                        # 升级
                         origin_storeDay = int(ubqs[0]['bucket__storeDay'])
                         upgrade_storeDay = int(smqs[0]['bucket__storeDay'])
                         ctcTime = ubqs[0]['endTime'] - nowTime
                         multiple = math.ceil(upgrade_storeDay / origin_storeDay)
-                        ubqs.update(endTime=ctcTime / multiple + addTime + ubqs[0]['endTime'])
+                        ubqs.update(endTime=ctcTime / multiple + addTime + ubqs[0]['endTime'],bucket_id=bucketId)
         # 新增模式
         else:
-            print('craete')
+            print('create')
             UID_Bucket.objects.create(
                 uid=UID,
                 channel=channel,

Object/TokenObject.py

@@ -21,7 +21,7 @@ class TokenObject:
 
     def __init__(self, token=None):
         if token == 'local':
-            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJleHAiOjE1NDYyNDMyMTh9.yF1v_qcMoX8WYbeJz4OeW9rKXLEHh0TfPcvLfiE7jSo'
+            token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiZW4iLCJleHAiOjE1NDcwMTQxMzN9.0DfelpUyIWwqPJOBqaPK8AVEB8lXM_7Yfb2jnSRh_jY'
         if token == 'test':
             token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTE1NjQyNjIzMzc5Mzk1MTM4MDAxMzgwMDEiLCJsYW5nIjoiZW4iLCJleHAiOjE1NDcwMTMzMjV9.4Q-hqqihFClYKCIoUd16ZZe2FRvpElmio6P25Qpg26Q'
         self.token = token