utc时间推送

Ansjer/test/osssigput.py

@@ -25,7 +25,7 @@ http://test.dvema.com/cloudVod/getSts?uidToken=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1N
 '''
 
 
-tokenss ={"ip": "120.237.157.184", "expire": "3600", "bucket_name": "cnvod3", "storage": "5ZBU8UD6RHMZJ5JW111A/vod2/", "endpoint": "oss-cn-shenzhen.aliyuncs.com", "Expiration": "2019-01-02T07:28:39Z", "AccessKeySecret": "6qLxVJZyUQ4RBCfQGXTRbiFJrUo9BEidKHp9tuK93Krv", "code": 0, "arn": "acs:ram::1901342792446414:role/stsoss/5ZBU8UD6RHMZJ5JW111A", "SecurityToken": "CAISxgJ1q6Ft5B2yfSjIr4n7Kc35tO5U4pOKd0X/kGdnWuFKm7Pp1Dz2IHFIf3NhAe0bv/kzm2lX7/YYlr0uebV4FXHoM/FQy6Z1rCGeOtOYkpRnPQ+HYNj3d1KIAjvXgeUsCoeQFaElE5XAQlTAkTAJkNmeXD6+XlujHISUgJp8FLo+VRW5ajw0TbUzIRB5+vcHKVzbN/umLnyShXHLXmZlvgdghER166m03re4iHzkgUb91/UeqqnoP5GgdLMMBppkVMqv1+EELsiH2SVLuR9R7/U03u4W8jHZud3GRARjySjWDsaKyP1KHi0kRJdjQvdt6+b7mac/+M6rztWvkk0RZ74ECXiDGtz5nPGpQr35aowLEp/gIGnI39y1MZ34jhgpe3pzNnkRKoZ6cC4oVEF9F22Fc/D+qArQDBy/UK+ey7GQWgfwCpUwlhqAAUkADkhHmc1Y0VJSCX7P7x0QK6cmkgKHDJuvqRQeuByEv1udBKNi1w/hPpegfmL6cWYl4LhYSavdElvg0CwyHD9dUuUlPXonnWSo52r5lhsgwpLgBmdmUhL8NnoGqzfeDq4ZU5FmM44vQXLU16qejz1oUjqTnquk0dVJW40K7fxj", "AccessKeyId": "STS.NJNbwMY1uUQaucNtg2VnftvB6"}
+tokenss ={"arn": "acs:ram::1901342792446414:role/stsoss/P2WNGJRD2EHA5EU9111A", "Expiration": "2019-01-22T07:02:57Z", "expire": "3600", "SecurityToken": "CAIS9AJ1q6Ft5B2yfSjIr4nXCNzBnZtD5pulMFfHkFIhbvlGoYP/rjz2IHFIf3NhAe0bv/kzm2lX7/YYlr1LEaBjam7+QZFdzr0K3D7wOtOYkpRvBy7OZ9j3d1KIAjvXgeV+CoeQFaELE5XAQlTAkTAJkNmeXD6+XlujHISUgJp8FLo+VRW5ajw0TbUzIRB5+vcHKVzbN/umLnyShXHLXmZlvgdghER166m03re4iHzkgUb91/UeqqnoP5GgdLMMBppkVMqv1+EELsiH2SVLuR9R7/U03u4W5CzZud3ERGEL3DOpEdD4qPBPBVJUW/ljQvdt6+b7maQ/+JaX9eXW0z9BMftYSD+lIImr25n/H/6zPdsYbcSCWROUiIjJbMKq9Vp5PjRCZF9oA4NwciYrVUZzG2uGdvH7oQzwD139G/Tf4sYfyoFoyljkx92OKmWUTq+RuSRiYc5gNBl5b0NLjDG9LfZZKlwWaT18G62SVp5jypvDLGYoZWYagAGxJJYnBHcZPAqwX3N5KHH0t9hpC7+2gABri7XCw+gg0SWUt6LfyeRy/AcOS1DDkhaCJpTRzLLFdzCjByCFZ9ywqkDbJ+WVVjs1eyOxJvWJ6Q/IX1fQ1TTdf8+jHLmVHpPXLgvzyZWyg2I5O/zh08/ztkQoLLEGNgqQWoWgL6Bspg==", "AccessKeyId": "STS.NJbCfupDbQYN2qvtRtbvjNFTL", "AccessKeySecret": "ZxEb3t564YSBaqCWAgUwqebuhdmPnbAKNdj6zwUjokh", "ip": "120.237.157.184", "bucket_name": "usvod1", "endpoint": "oss-us-west-1.aliyuncs.com", "code": 0, "storage": "P2WNGJRD2EHA5EU9111A/vod1/"}
 # 使用RAM账号的AccessKeyId和AccessKeySecret向STS申请临时token。
 
 # 使用临时token中的认证信息初始化StsAuth实例。

Controller/CloudVod.py

@@ -210,7 +210,8 @@ class CloudVodView(View):
         content = smqs[0]['content']
         day = smqs[0]['day']
         uid = qs[0]['UID']
-        ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel, endTime__gte=CommonService.get_utc()). \
+        nowTime = int(time.time())
+        ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel, endTime__gte=nowTime). \
             values("bucket__storeDay", "bucket__region")
         if ubqs.exists():
             if ubqs[0]['bucket__region'] != smqs[0]['bucket__region']:
@@ -218,7 +219,7 @@ class CloudVodView(View):
             elif ubqs[0]['bucket__storeDay'] > smqs[0]['bucket__storeDay']:
                 return response.json(711)  # 不可降级
             # 续费流程
-        nowTime = CommonService.get_utc()
+        nowTime = int(time.time())
         # 判断是否存在未完成订单
         hasOrder = Order_Model.objects.filter(UID=uid, channel=channel, addTime__lte=3600 + nowTime, status=0,
                                               rank_id=rank). \
@@ -276,20 +277,19 @@ class CloudVodView(View):
         print(UID)
         ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, status=1). \
             values('channel', 'bucket__bucket', 'bucket__endpoint', 'bucket__region', 'endTime')
-        now_time = CommonService.get_utc()
+        now_time = int(time.time())
         if not ubqs.exists():
             res = {'code': 404, 'msg': '未购买'}
             return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")
         elif ubqs[0]['endTime'] < now_time:
             res = {'code': 404, 'msg': '过期'}
             return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")
-        now_time_stamp = CommonService.get_utc()
         oc_qs = OssCrdModel.objects.filter(uid=UID, channel=channel).values("addTime", "data")
         if oc_qs.exists():
             endTime = int(oc_qs[0]["addTime"]) + 3500
-            if endTime > now_time_stamp:
+            if endTime > now_time:
                 print(endTime)
-                print(now_time_stamp)
+                print(now_time)
                 res = json.loads(oc_qs[0]["data"])
                 return JsonResponse(status=200, data=res)
         # 套餐id
@@ -343,9 +343,9 @@ class CloudVodView(View):
             'storage': storage,
             'ip': ip}
         if oc_qs.exists():
-            oc_qs.update(data=json.dumps(res), addTime=now_time_stamp)
+            oc_qs.update(data=json.dumps(res), addTime=now_time)
         else:
-            OssCrdModel.objects.create(uid=UID, channel=channel, data=json.dumps(res), addTime=now_time_stamp)
+            OssCrdModel.objects.create(uid=UID, channel=channel, data=json.dumps(res), addTime=now_time)
         return JsonResponse(status=200, data=res)
 
     # # 获取设备回放列表
@@ -416,7 +416,8 @@ class CloudVodView(View):
             # 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())
+        nowTime = int(time.time())
+        order_qs.update(status=1, updTime=nowTime)
         order_list = order_qs.values("UID", "rank_id", "channel")
         rank_id = order_list[0]['rank_id']
         UID = order_list[0]['UID']
@@ -427,7 +428,7 @@ class CloudVodView(View):
             return response.json(0, '套餐已删除')
         addTime = int(smqs[0]["day"]) * 24 * 3600
         ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel).values("bucket_id", "endTime", "bucket__storeDay")
-        nowTime = CommonService.get_utc()
+        nowTime = int(time.time())
         if ubqs.exists():
             # 判断是否过期了
             if nowTime > ubqs[0]['endTime']:
@@ -472,7 +473,7 @@ class CloudVodView(View):
         ubqs = UID_Bucket.objects.filter(channel=channel, uid=UID)
         if not ubqs.exists():
             return response.json(10, '未购买')
-        now_time = CommonService.get_utc()
+        now_time = int(time.time())
         if now_time > ubqs[0].endTime:
             return response.json(10, '已过期')
         ubqs.update(status=status)
@@ -499,7 +500,7 @@ class CloudVodView(View):
         channel = utko.channel
         print(channel)
         print(UID)
-        nowTime = CommonService.get_utc()
+        nowTime = int(time.time())
         qs = UID_Bucket.objects.filter(uid=UID, channel=channel, status=1, endTime__gte=nowTime). \
             values("channel", "bucket__storeDay", "bucket_id")
         if not qs.exists():
@@ -530,7 +531,7 @@ class CloudVodView(View):
         ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel).values('status')
         if not ubqs.exists():
             return response.json(10, '设备未购买')
-        nowTime = CommonService.get_utc()
+        nowTime = int(time.time())
         vodqs = VodHlsModel.objects.filter(uid=UID, channel=channel, time__range=(startTime, endTime),
                                            endTime__gte=nowTime) \
             .values("time", "sec", "bucket__bucket", "bucket__endpoint", "bucket__region")
@@ -560,6 +561,7 @@ class CloudVodView(View):
             vod_play_list.append({'name': vod['time'], 'sign_url': vod_play_url, 'thumb': thumb, 'sec': vod['sec']})
         return response.json(0, vod_play_list)
 
+# http://test.dvema.com/cloudVod/filterVod?token=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VySUQiOiIxNTIzNDE5MDcwMDY3ODUzMTM1MjcyNjA3MDciLCJ1c2VyIjoiMTM1MjcyNjA3MDciLCJsYW5nIjoiZW4iLCJleHAiOjE1NDg2NTU5NjR9.vuvgEJUyWA3mjVVBt2R5P9weqRmRNjWwAf_wsEG8sPk&did=138001380001548053701910104&channel=1&startTime=1&endTime=156489745645
     def do_filter_playlist(self, request_dict, userID, response):
         startTime = int(request_dict.get('startTime', None))
         endTime = int(request_dict.get('endTime', None))
@@ -572,7 +574,7 @@ class CloudVodView(View):
         ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel).values('status')
         if not ubqs.exists():
             return response.json(10, '设备未购买')
-        nowTime = CommonService.get_utc()
+        nowTime = int(time.time())
         vodqs = VodHlsModel.objects.filter(uid=UID, channel=channel, time__range=(startTime, endTime),
                                            endTime__gte=nowTime) \
             .values("time", "sec", "bucket__bucket", "bucket__endpoint", "bucket__region")
@@ -614,7 +616,7 @@ class CloudVodView(View):
         ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel).values('status')
         if not ubqs.exists():
             return response.json(10, '设备未购买')
-        nowTime = CommonService.get_utc()
+        nowTime = int(time.time())
         vodqs = VodHlsModel.objects.filter(uid=UID, channel=channel, endTime__gte=nowTime) \
             .values("time", "sec", "bucket__bucket", "bucket__endpoint", "bucket__region")
         vod_play_list = []

Controller/EquipmentManager.py

@@ -35,7 +35,7 @@ def queryUserEquipmentInterface(request):
     ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
         values('bucket__content', 'status', 'channel', 'endTime', 'uid')
     res = []
-    nowTime = CommonService.get_utc()
+    nowTime = int(time.time())
     for p in dvdict['datas']:
         p['fields']['vod'] = []
         for dm in ubqs:

Controller/OrderContrller.py

@@ -11,7 +11,7 @@
 @file: OrderContrller.py
 @Contact: chanjunkai@163.com
 """
-
+import time
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
@@ -89,7 +89,7 @@ class OrderView(View):
                                                               "rank_id")
         order_list = list(order_ql)
         data = []
-        nowTime = CommonService.get_utc()
+        nowTime = int(time.time())
         # 这里需要进行优化
         uid_list = []
         for od in order_list:

Controller/VodBucket.py

@@ -23,7 +23,7 @@ from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Service.CommonService import CommonService
 from Service.ModelService import ModelService
-
+import time
 
 class VodBucketView(View):
     @method_decorator(csrf_exempt)
@@ -68,7 +68,7 @@ class VodBucketView(View):
 
     def do_add(self, request_dict, response):
         request_dict.pop('token')
-        nowTime = CommonService.get_utc()
+        nowTime = int(time.time())
         try:
             VodBucketModel.objects.create(addTime=nowTime, updTime=nowTime, **request_dict)
         except Exception as e:
@@ -82,8 +82,7 @@ class VodBucketView(View):
 
     def do_update(self, request_dict, response):
         request_dict.pop('token')
-
-        nowTime = CommonService.get_utc()
+        nowTime = int(time.time())
         id = request_dict.get('id', None)
         try:
             VodBucketModel.objects.filter(id=id).update(updTime=nowTime, **request_dict)
@@ -159,7 +158,7 @@ class UidBucketView(View):
             bucketId = smqs[0]['bucket_id']
             addDay = smqs[0]['day']
             addTime = addDay * 3600 * 24
-            nowTime = CommonService.get_utc()
+            nowTime = int(time.time())
             ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel).values("bucket_id", "endTime",
                                                                               "bucket__storeDay")
             if ubqs.exists():
@@ -207,7 +206,7 @@ class UidBucketView(View):
         status = request_dict.get('status', None)
         id = request_dict.get('id', None)
         ubqs = UID_Bucket.objects.filter(id=id).values('endTime')
-        nowTime = CommonService.get_utc()
+        nowTime = int(time.time())
         endTime = ubqs[0]['endTime']
         if not ubqs.exists():
             return response.json(10, '未购买')

Service/CommonService.py

@@ -181,11 +181,4 @@ class CommonService:
             if 'end_time' in ps:
                 ps['end_time'] = ps['end_time'].strftime("%Y-%m-%d %H:%M:%S")
             res.append(ps)
-        return res
-
-    # 获取utc时间戳
-    @staticmethod
-    def get_utc():
-        nowdtm = datetime.datetime.utcnow()
-        un_time = time.mktime(nowdtm.timetuple())
-        return int(un_time)
+        return res