fix a more bug

Controller/CloudVod.py

@@ -209,10 +209,10 @@ class CloudVodView(View):
         ubqs = UID_Bucket.objects.filter(uid=uid, channel=channel, endTime__gte=CommonService.get_utc()). \
             values("bucket__storeDay", "bucket__region")
         if ubqs.exists():
-            if ubqs[0]['bucket__storeDay'] > smqs[0]['bucket__storeDay']:
-                return response.json(10, '不可降级')
-            elif ubqs[0]['bucket__region'] != smqs[0]['bucket__region']:
+            if ubqs[0]['bucket__region'] != smqs[0]['bucket__region']:
                 return response.json(10, '区域不一致')
+            elif ubqs[0]['bucket__storeDay'] > smqs[0]['bucket__storeDay']:
+                return response.json(10, '不可降级')
             # 续费流程
         nowTime = CommonService.get_utc()
         # 判断是否存在未完成订单
@@ -264,11 +264,8 @@ class CloudVodView(View):
                 return response.json(0, {"redirectUrl": approval_url})
         return response.json(10, 'generate_order_false')
 
+    #  生成设备sts上传授权
     def do_getSts(self, request_dict, ip, response):
-        '''
-        生成sts上传授权
-        '''
-        # uidToken = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiJGVFNMTDhITTQzN1ozOFdVMTExQSJ9.GIBt8SgY-3yRt9mlihtvRwLM-MT8uVPDKCUQ2yvV3Vo'
         uidToken = request_dict.get('uidToken', None)
         utko = UidTokenObject(uidToken)
         if utko.flag is False:
@@ -277,9 +274,8 @@ class CloudVodView(View):
         channel = utko.channel
         print(channel)
         print(UID)
-        ubqs = UID_Bucket.objects.filter(uid=UID, channel=channel, status=1).values('channel', 'bucket__bucket',
-                                                                                    'bucket__endpoint',
-                                                                                    'bucket__region', 'endTime')
+        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():
             res = {'code': 404, 'msg': '未购买'}
@@ -322,7 +318,7 @@ class CloudVodView(View):
                     "Resource": [Resource_access],
                     "Effect": "Allow",
                     "Condition": {
-                        # "IpAddress": {"acs:SourceIp": ip}
+                        "IpAddress": {"acs:SourceIp": ip}
                         # "IpAddress": {"acs:SourceIp": "120.237.157.184"}
                         # "IpAddress": {"acs:SourceIp": "*"}
                     }
@@ -371,8 +367,6 @@ class CloudVodView(View):
             .values('endTime', 'bucket__bucket', 'bucket__endpoint')
         if not ubqs.exists():
             return response.json(10, '未购买或过期')
-        # if now_time > ubqs[0]['endTime']:
-        #     return response.json(10, '已过期')
         if not ubqs.exists():
             return response.json(10, '未开通云存储')
         bucket_name = ubqs[0]["bucket__bucket"]