a

Ansjer/config.py

@@ -123,5 +123,6 @@ FCM_CONFIG = {
     'com.ansjer.customizeda_a': 'AAAAb9YP3rk:APA91bF0HzizVWDc6dKzobY9fsaKDK4veqkOZehDXshVXs8pEEvNWjR_YWbhP60wsRYCHCal8fWN5cECVOWNMMzDsfU88Ty2AUl8S5FtZsmeDTkoGntQOswBr8Ln7Fm_LAp1VqTf9CpM',
     'com.ansjer.customizedd_a': 'AAAAb9YP3rk:APA91bHkxOozJWBrlv3eNT0PgwosYENI9aM4Zuzd418cX-iKkpa1zFNC5MkNDKApx1KH4fhmAfaJ6IMRZ0nj5GIxCpstDYCaZWwgC7-etqfSxG5JAq8LOwJx0o_1tUZqwjIic8ztsg0o',
     'com.ansjer.adcloud_a': 'AAAAb9YP3rk:APA91bFm06w8b9OKQ0gz0iaWFuRqRIkvgAz6z7Gp3dBU_X-LNGJQd1hc1QR2W7QzBglF8SHtERA45a2lbdLRa5qv7hxfd6W_sJLBK7dA8jklsOQBvy505oUzTwMKWy4TwH-exps9KrhO',
-    'com.ansjer.accloud_a': 'AAAAb9YP3rk:APA91bFm06w8b9OKQ0gz0iaWFuRqRIkvgAz6z7Gp3dBU_X-LNGJQd1hc1QR2W7QzBglF8SHtERA45a2lbdLRa5qv7hxfd6W_sJLBK7dA8jklsOQBvy505oUzTwMKWy4TwH-exps9KrhO'
+    'com.ansjer.accloud_a': 'AAAAb9YP3rk:APA91bFm06w8b9OKQ0gz0iaWFuRqRIkvgAz6z7Gp3dBU_X-LNGJQd1hc1QR2W7QzBglF8SHtERA45a2lbdLRa5qv7hxfd6W_sJLBK7dA8jklsOQBvy505oUzTwMKWy4TwH-exps9KrhO',
+    'com.ansjer.zccloud_ab': 'AAAAb9YP3rk:APA91bHu8u-CTpcd0g6lKPo0WNVqCi8jZub1cPPbSAY9AucT1HxlF65ZDUko9iG8q2ch17bwu9YWHpK1xI1gHSRXCslLvZlXEmHZC0AG3JKg15XuUvlFKACIajUFV-pOeGRT8tM6-31I',
 }

Ansjer/config_formal.py

@@ -12,7 +12,6 @@
 @Contact: chanjunkai@163.com
 """
 NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
-SERVER_DOMAIN = 'http://www.dvema.com/'
 SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
 DOMAIN_HOST = 'www.dvema.com'
 SERVER_HOST = 'localhost'

Ansjer/test/kbt.py

@@ -1,11 +1,5 @@
-import requests
-
-data= {
-    'token':'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJtX2NvZGUiOiIxMjM0MTMyNDMyMTQiLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJleHAiOjE1ODE4MjA2MjcsInVzZXJJRCI6IjE1MTU2NDI2MjMzNzkzOTUxMzgwMDEzODAwMSIsImxhbmciOiJlbiJ9.SuDHinc0xJ5ETclE1SY-9lSEoebBTBje6OZ0r4Plqjw',
-    'm_code':"AN02000080B10000001cd3.zccloud_ab",
-    'os_type':'jiguang',
-    'appid':'com.ansjer.zccloud_ab',
-    'udid':"AN02000080b10000001cd3"
-}
-res = requests.post(url='http://test.dvema.com/v2/account/logout',data=data)
-print(res.text)
+trtrt = '0'
+if trtrt:
+    print(1)
+else:
+    print(2)

Controller/CloudStorage.py

@@ -37,6 +37,9 @@ from Service.ModelService import ModelService
 from Object.ETkObject import ETkObject
 
 
+SERVER_DOMAIN = 'http://cloudstroage.dvema.com/'
+
+
 # 设备信息添加
 class CloudStorageView(View):
 
@@ -218,7 +221,7 @@ class CloudStorageView(View):
                 if sts_qs.exists():
                     sts_qs.update(data=json.dumps(res), addTime=now_time)
                 else:
-                    StsCrdModel.objects.create(uid=uid, channel=channel, data=json.dumps(res), addTime=now_time)
+                    StsCrdModel.objects.create(uid=uid, channel=channel, data=json.dumps(res), addTime=now_time,type=1)
                 return JsonResponse(status=200, data=res)
             else:
                 res = {'code': 404, 'msg': 'data not exists!'}
@@ -226,7 +229,66 @@ class CloudStorageView(View):
                                     content_type="application/json,charset=utf-8")
 
     def do_store_playlist(self, request_dict, response):
-        return
+        uidToken = request_dict.get('uidToken', None)
+        storeTime = request_dict.get('time', None)
+        sec = request_dict.get('sec', None)
+        fg = request_dict.get('fg', None)
+        utko = UidTokenObject(uidToken)
+        if utko.flag is False:
+            return response.json(444, 'uidToken')
+        if not uidToken or not storeTime or not sec:
+            return response.json(0)
+        pass
+        UID = utko.UID
+        channel = utko.channel
+        print('UID:')
+        print(UID)
+        print('channel:')
+        print(channel)
+        now_time = int(time.time())
+        ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, endTime__gte=now_time). \
+            values("bucket__mold", "bucket__bucket", "bucket__endpoint", "bucket__region", "status","bucket__storeDay")
+        if ubqs.exists():
+            ub_qs_data = ubqs[0]
+            store_day = ub_qs_data['bucket__storeDay']
+            bucket_id = ub_qs_data['bucket_id']
+            end_time = int(storeTime)+store_day*86400
+            if ub_qs_data['status'] == 1:
+                if ub_qs_data["bucket__mold"] == 0:
+                    oss_crd_qs = OssCrdModel.objects.filter(uid=UID, channel=channel)
+                    if oss_crd_qs.exists():
+                        VodHlsModel.objects.create(
+                            uid=UID,
+                            channel=channel,
+                            time=storeTime,
+                            endTime=end_time,
+                            bucket_id=bucket_id
+                        )
+                        return response.json(0)
+                    else:
+                        res = {'code': 404, 'msg': '设备未购买'}
+                        return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")
+                elif ub_qs_data['bucket__mold'] == 1:
+                    sts_qs = StsCrdModel.objects.filter(uid=UID, channel=channel,type=1). \
+                        values("addTime", "data")
+                    if sts_qs.exists():
+                        VodHlsModel.objects.create(
+                            uid=UID,
+                            channel=channel,
+                            time=storeTime,
+                            endTime=end_time,
+                            bucket_id=bucket_id
+                        )
+                        return response.json(0)
+                    else:
+                        res = {'code': 404, 'msg': '设备未购买'}
+                        return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")
+            else:
+                res = {'code': 404, 'msg': '设备未开启'}
+                return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")
+        else:
+            res = {'code': 404, 'msg': '设备未购买'}
+            return HttpResponse(json.dumps(res, ensure_ascii=False), content_type="application/json,charset=utf-8")
 
     def do_change_vod_status(self, request_dict, userID, response):
         uid = request_dict.get('uid', None)

Model/models.py

@@ -555,6 +555,8 @@ class VodHlsModel(models.Model):
     sec = models.IntegerField(verbose_name='秒数', default=0)
     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, default=1,
                                verbose_name='存储空间')
+    fg = models.SmallIntegerField(default=0,verbose_name='时间片段数') # 0为阿里云存储方案 >0为亚马逊方案
+
 
     def __str__(self):
         return self.id
@@ -593,6 +595,7 @@ class StsCrdModel(models.Model):
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     bucket = models.ForeignKey(VodBucketModel, blank=True, to_field='id', on_delete=models.CASCADE, default=1,
                                verbose_name='存储空间')
+    type = models.SmallIntegerField(default=0,verbose_name='sts类型') # 0:阿里云,1:s3
 
     def __str__(self):
         return self.id