order表增加endTime字段

Ansjer/test/osssigput.py

@@ -25,7 +25,7 @@ http://test.dvema.com/cloudVod/getSts?uidToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1N
 '''
 
 
-tokenss = {"AccessKeyId": "STS.NHni76oniM27eB6mLEmw67Kr8", "AccessKeySecret": "F6mNGwMyz8cMbhHJm26QiPxrZAtu2AC3yXBbkAXa5PJh", "SecurityToken": "CAISxwJ1q6Ft5B2yfSjIr4vbIo2CgrFI+vDcZ2SHiUwQYfga2I7Z2jz2IHFIf3NhAe0bv/kzm2lX7/YYlr1dd6RhYRzkSJcrsaYMoTycOtOYkpQAX3LuHNn3d1KIAjvXgeUtCoeQFaEkE5XAQlTAkTAJkNmeXD6+XlujHISUgJp8FLo+VRW5ajw0TbUzIRB5+vcHKVzbN/umLnyShXHLXmZlvgdghER166m03re5iHzkgUb91/UeqqnoP5GgdLMMBppkVMqv1+EEL8iG2SVLuR9R7/U03u4W9jLZud3ERHdt2DGiY8rxroYwHlQpWZVjQvdt6+b7maQi/a7x792mk08WYbsKAn6DGN78mZf+dbn3ZopjR9HSIG/Q192DDJ7xvj4/bGgTXAEwIIt9cSUhUUFxG2yGdfb4oQCQeGm4V7OCy7omdxHoSpAoJbEagAEmSR8slfOl+iU3tlgyeBuH6aywtWa3kIjqTFBl0Jdko4mCbbbxgpMjRIftC+5vDAELOOhZm1epHDtF6aeQ4MDR0NHzLApvmn2i3pUMmI5azPxgTh24LuemCEWpPQjUPLFytvtzbXiJdAl5HpvYWLtuVwjEyMZDDy4YIom5cTLUAA==", "Expiration": "2018-12-18T07:48:33Z", "expire": "3600", "endpoint": "oss-eu-central-1.aliyuncs.com", "bucket_name": "gmvod1", "arn": "acs:ram::1901342792446414:role/stsoss/FTSLL8HM437Z38WU111A", "code": 0, "storage": "FTSLL8HM437Z38WU111A/vod12/", "ip": "192.168.136.40"}
+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"}
 # 使用RAM账号的AccessKeyId和AccessKeySecret向STS申请临时token。
 
 # 使用临时token中的认证信息初始化StsAuth实例。
@@ -55,11 +55,11 @@ bucket = oss2.Bucket(auth, tokenss['endpoint'], tokenss['bucket_name'])
 # # 上传一个字符串。
 # bucket.delete_object('a-3.txt')
 # exit()
-patht=tokenss['storage']+'ggg.1234'
+patht=tokenss['storage']+'asdfasdfdsa.1234'
 print(patht)
 print(endpoint)
-# bucket.put_object(patht, b'gg')
-bucket.put_object('FTSLL8HM437Z38WU111A/vod4/1234.txt', b'12345646',headers)
+bucket.put_object(patht, b'safasdfasdgg')
+# bucket.put_object('FTSLL8HM437Z38WU111A/vod4/1234.txt', b'12345646',headers)
 exit()
 res = bucket.get_object('1234.txt')
 print(res.read())

Controller/CloudVod.py

@@ -141,12 +141,13 @@ class CloudVodView(View):
                 return response.json(10,'不能降级套餐')
         nowTime = int(time.time())
         orderID = CommonService.createID()
-        smqs = Store_Meal.objects.filter(id=rank).values("currency", "price", "content")
+        smqs = Store_Meal.objects.filter(id=rank).values("currency", "price", "content","day")
         if not smqs.exists():
             return response.json(10, '套餐不存在')
         currency = smqs[0]['currency']
         price = smqs[0]['price']
         content = smqs[0]['content']
+        day = smqs[0]['day']
         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(
@@ -183,10 +184,12 @@ class CloudVodView(View):
                     UID=uid,
                     channel=channel,
                     userID_id=userID,
-                    desc='',
-                    price='',
+                    desc=content,
+                    price=price,
+                    currency=currency,
                     addTime=nowTime,
                     updTime=nowTime,
+                    endTime=nowTime+int(day)*3600*24,
                     rank_id=rank,
                     paypal=approval_url
                 )

Model/models.py

@@ -163,7 +163,7 @@ class Device_User(AbstractBaseUser):
                               verbose_name=u'用户ID', unique=True)
     role = models.ManyToManyField(to='Role', blank=True, verbose_name=u'用户角色', db_table='user_role')
 
-    username = models.CharField(max_length=40, verbose_name=u'用户名', default='', blank=True)
+    username = models.CharField(max_length=64, verbose_name=u'用户名', default='', blank=True)
     password = models.CharField(max_length=128, verbose_name=u'密码')
     userEmail = models.EmailField(max_length=64, verbose_name=u'邮箱', default='', blank=True)
     # 实际的路径就是 MEDIA_ROOT/Image/filename,所以可用upload_to来指定文件存放的前缀路径
@@ -578,8 +578,10 @@ class Order_Model(models.Model):
     channel = models.SmallIntegerField(default=0, verbose_name=u'通道数')
     desc = models.CharField(max_length=50, default='', verbose_name='商品描述')
     price = models.CharField(default='', max_length=16, verbose_name='价格')
+    currency = models.CharField(blank=True, default='USD', max_length=32, verbose_name=u'货币')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
+    endTime = models.IntegerField(verbose_name='结束时间', default=0)
     status = models.SmallIntegerField(default=0, verbose_name='付款状态')
     # 订单关联套餐
     rank = models.ForeignKey(Store_Meal, to_field='id', default='', on_delete=models.CASCADE, verbose_name='套餐类型')