primaryMaster增加

Controller/CloudVod.py

@@ -102,7 +102,6 @@ class CloudVodView(View):
             userID = tko.userID
             if operation == 'getHlsList':
                 return self.do_get_playlist(request_dict, userID, response)
-
                 # return self.do_get_hls_list(request_dict, userID, response)
             elif operation == 'createOrder':
                 return self.do_create_order(request_dict, userID, response)
@@ -110,8 +109,6 @@ class CloudVodView(View):
                 return self.do_change_status(request_dict, userID, response)
             elif operation == 'playlist':
                 return self.do_get_playlist(request_dict, userID, response)
-            elif operation == 'appSts':
-                return self.do_get_appSts(request_dict, userID, response)
             elif operation == 'details':
                 return self.do_get_details(request_dict, response)
             else:
@@ -130,82 +127,6 @@ class CloudVodView(View):
             res = list(ubqs)
         return response.json(0, res)
 
-    def do_get_appSts(self, request_dict, userID, response):
-        did = request_dict.get('id')
-        channel = request_dict.get('channel')
-        dvqs = Device_Info.objects.filter(userID_id=userID, id=did,isShare=False).values('UID')
-        if not dvqs.exists():
-            return response.json(10, '设备不属于')
-        UID = dvqs[0]['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()
-        if not ubqs.exists():
-            return response.json(10, '未购买')
-        elif now_time > ubqs[0]['endTime']:
-            return response.json(10, '过期')
-        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:
-                res = json.loads(oc_qs[0]["data"])
-                return JsonResponse(status=200, data=res)
-        # 套餐id
-        storage = '{uid}/vod{channel}/'.format(uid=UID, channel=channel)
-        bucket_name = ubqs[0]['bucket__bucket']
-        endpoint = ubqs[0]['bucket__endpoint']
-        access_key_id = OSS_STS_ACCESS_KEY
-        access_key_secret = OSS_STS_ACCESS_SECRET
-        region_id = ubqs[0]['bucket__region']
-        role_arn = OSS_ROLE_ARN
-        clt = client.AcsClient(access_key_id, access_key_secret, region_id)
-        req = AssumeRoleRequest.AssumeRoleRequest()
-        # 设置返回值格式为JSON。
-        req.set_accept_format('json')
-        req.set_RoleArn(role_arn)
-        req.set_RoleSessionName(UID)
-        req.set_DurationSeconds(3600)
-        Resource_access = "acs:oss:*:*:{bucket_name}/{uid_channel}*".format(bucket_name=bucket_name,
-                                                                            uid_channel=storage)
-        print(Resource_access)
-        policys = {
-            "Version": "1",
-            "Statement": [
-                {
-                    "Action": ["oss:PutObject", "oss:DeleteObject", ],
-                    "Resource": [Resource_access],
-                    "Effect": "Allow",
-                    "Condition": {
-                        # "IpAddress": {"acs:SourceIp": ip}
-                        # "IpAddress": {"acs:SourceIp": "120.237.157.184"}
-                        # "IpAddress": {"acs:SourceIp": "*"}
-                    }
-                }
-            ]
-        }
-        req.set_Policy(Policy=json.dumps(policys))
-        body = clt.do_action(req)
-        # 使用RAM账号的AccessKeyId和AccessKeySecret向STS申请临时token。
-        token = json.loads(body.decode('utf-8'))
-        print(token)
-        res = {
-            'AccessKeyId': token['Credentials']['AccessKeyId'],
-            'AccessKeySecret': token['Credentials']['AccessKeySecret'],
-            'SecurityToken': token['Credentials']['SecurityToken'],
-            'Expiration': token['Credentials']['Expiration'],
-            'expire': '3600',
-            'endpoint': endpoint,
-            'bucket_name': bucket_name,
-            'arn': token['AssumedRoleUser']['Arn'],
-            'code': 0,
-            'storage': storage}
-        # 'ip': ip}
-        if oc_qs.exists():
-            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)
-        return JsonResponse(status=200, data=res)
-
     def do_pay_error(self):
         response = HttpResponse()
         response.content = '''

Controller/Test.py

@@ -33,6 +33,8 @@ from django.shortcuts import render_to_response, render, redirect
 import paypalrestsdk
 from django.http import HttpResponseRedirect, HttpResponse
 
+
+# 测试接口sdk
 class Test(View):
     '''
     limit=10：指定返回记录的数量
@@ -46,28 +48,24 @@ class Test(View):
     def dispatch(self, *args, **kwargs):
         return super(Test, self).dispatch(*args, **kwargs)
 
-    # 查询
-    '''
-    /Test?paymentId=PAY-4VL25365CA733482BLPMAHBI&token=EC-1SU951197H0006730&PayerID=A29TCMY2J8G9C
-    '''
-
-    @ratelimit(key='ip', rate='1/m')
     def get(self, request, *args, **kwargs):
-        import datetime
-        print(datetime.datetime.now())
-        return JsonResponse(data={})
-        # 阿里云oss测试
-        return self.ossCrd()
-        # 七牛测试
-        # return self.qiniutokentest()
-        # paypal测试
-        # return self.paypaytest(request)
+        return self.updatePrimaryMaster()
 
     # 增加
+
     def post(self, request, *args, **kwargs):
         response = ResponseObject()
         return response.json(0)
 
+    def updatePrimaryMaster(self):
+        from Model.models import Device_Info, Device_User
+        qs = Device_Info.objects.filter(isShare=True, primaryMaster='').values('primaryUserID', 'id')
+        for i in qs:
+            is_update = Device_Info.objects.filter(id=i['id']). \
+                update(primaryMaster=Device_User.objects.get(userID=i['primaryUserID']).username)
+            print(is_update)
+        return HttpResponse(status=200, content='1234')
+
     def ossCrd(self):
         '''
         生成sts上传授权
@@ -119,17 +117,17 @@ class Test(View):
         # 使用RAM账号的AccessKeyId和AccessKeySecret向STS申请临时token。
         token = json.loads(body)
         print(token)
-        res={
-            'AccessKeyId':token['Credentials']['AccessKeyId'],
-            'AccessKeySecret':token['Credentials']['AccessKeySecret'],
-            'SecurityToken':token['Credentials']['SecurityToken'],
-            'Expiration':token['Credentials']['Expiration'],
-            'expire':'3600',
-            'endpoint':endpoint,
-            'bucket_name':bucket_name,
-            'arn':token['AssumedRoleUser']['Arn']
+        res = {
+            'AccessKeyId': token['Credentials']['AccessKeyId'],
+            'AccessKeySecret': token['Credentials']['AccessKeySecret'],
+            'SecurityToken': token['Credentials']['SecurityToken'],
+            'Expiration': token['Credentials']['Expiration'],
+            'expire': '3600',
+            'endpoint': endpoint,
+            'bucket_name': bucket_name,
+            'arn': token['AssumedRoleUser']['Arn']
         }
-        return JsonResponse(status=200,data=res)
+        return JsonResponse(status=200, data=res)
 
     def qiniutokentest(self):
         # flake8: noqa